i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now puts out a message if the kernel doesn't fit to the boot loader.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9519 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-10-26 23:31:48 +00:00
parent c32cb87156
commit b229567a92
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/main.c
+7 -2
View File
@@ -14,6 +14,7 @@
#include <console.h> #include <console.h>
#include <debug.h> #include <debug.h>
#include <arch/faults.h> #include <arch/faults.h>
#include <arch/dbg_console.h>
#include <vm.h> #include <vm.h>
#include <timer.h> #include <timer.h>
#include <smp.h> #include <smp.h>
@@ -57,9 +58,13 @@ _start(kernel_args *oldka, int cpu_num)
kernel_startup = true; kernel_startup = true;
if (oldka->kernel_args_size != sizeof(kernel_args) if (oldka->kernel_args_size != sizeof(kernel_args)
|| oldka->version != CURRENT_KERNEL_ARGS_VERSION) || oldka->version != CURRENT_KERNEL_ARGS_VERSION) {
// ToDo: there is no debug output yet... // This is something we cannot handle right now - release kernels
// should always be able to handle the kernel_args of earlier
// released kernels.
arch_dbg_con_early_boot_message("Version mismatch between boot loader and kernel!\n");
return -1; return -1;
}
memcpy(&ka, oldka, sizeof(kernel_args)); memcpy(&ka, oldka, sizeof(kernel_args));
// the passed in kernel args are in a non-allocated range of memory // the passed in kernel args are in a non-allocated range of memory