From c5b5378a79434a2ea9dc75eb3d87817dc30a2947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 21 Oct 2003 05:39:36 +0000 Subject: [PATCH] The recently added load_kernel() tried to load the kernel again (there already was a load_kernel() call above). Added a comment that might prevent me from doing that again... git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5113 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/loader/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/kernel/boot/loader/main.cpp b/src/kernel/boot/loader/main.cpp index 1800031db4..5a571b8489 100644 --- a/src/kernel/boot/loader/main.cpp +++ b/src/kernel/boot/loader/main.cpp @@ -88,12 +88,11 @@ main(stage2_args *args) } } - // if everything is okay, continue booting + // if everything is okay, continue booting; the kernel + // is already loaded at this point and we definitely + // know our boot volume, too if (status == B_OK) { register_boot_file_system(volume); - - if (load_kernel(args, volume) < B_OK) - panic("could not load kernel"); load_modules(args, volume); // ToDo: cleanup, heap_release() etc.