From b1b1136ca31dcf0836cc0b45c569f58211f8e62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 31 May 2004 23:15:37 +0000 Subject: [PATCH] No longer uses gKernelEntry. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7710 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/platform/bios_ia32/start.c | 7 ++++--- src/kernel/boot/platform/openfirmware/start.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kernel/boot/platform/bios_ia32/start.c b/src/kernel/boot/platform/bios_ia32/start.c index 7457f03b7b..036cc0d849 100644 --- a/src/kernel/boot/platform/bios_ia32/start.c +++ b/src/kernel/boot/platform/bios_ia32/start.c @@ -5,6 +5,7 @@ #include "console.h" +#include "cpu.h" #include "mmu.h" #include @@ -55,7 +56,7 @@ platform_user_menu_requested(void) void platform_start_kernel(void) { - struct kernel_args *args = &gKernelArgs; + static struct kernel_args *args = &gKernelArgs; // something goes wrong when we pass &gKernelArgs directly // to the assembler inline below - might be a bug in GCC // or I don't see something important... @@ -63,7 +64,7 @@ platform_start_kernel(void) mmu_init_for_kernel(); //cpu_boot_other_cpus(); - printf("kernel entry at %lx\n", gKernelEntry); + printf("kernel entry at %lx\n", gKernelArgs.kernel_image.elf_header.e_entry); asm("movl %0, %%eax; " // move stack out of way "movl %%eax, %%esp; " @@ -73,7 +74,7 @@ platform_start_kernel(void) "pushl $0x0;" // dummy retval for call to main "pushl %1; " // this is the start address "ret; " // jump. - : : "g" (args), "g" (gKernelEntry)); + : : "g" (args), "g" (gKernelArgs.kernel_image.elf_header.e_entry)); } diff --git a/src/kernel/boot/platform/openfirmware/start.c b/src/kernel/boot/platform/openfirmware/start.c index 2163353e36..6b3dd0ba91 100644 --- a/src/kernel/boot/platform/openfirmware/start.c +++ b/src/kernel/boot/platform/openfirmware/start.c @@ -81,7 +81,7 @@ determine_machine(void) void platform_start_kernel(void) { - printf("kernel entry at %p\n", (void *)gKernelEntry); + printf("kernel entry at %p\n", (void *)gKernelArgs.kernel_image.elf_header.e_entry); of_exit(); }