From 1cd8c4cc089ffb3623a1ff761549a100cb1b4cce Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 27 Sep 2008 00:33:20 +0000
Subject: [PATCH] Let the boot loader set the kernel image's name.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27754 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/system/boot/loader/loader.cpp | 6 ++++--
 src/system/kernel/vm/vm.cpp       | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/system/boot/loader/loader.cpp b/src/system/boot/loader/loader.cpp
index 0bf41f65df..9cdc634bad 100644
--- a/src/system/boot/loader/loader.cpp
+++ b/src/system/boot/loader/loader.cpp
@@ -51,7 +51,7 @@ is_bootable(Directory *volume)
 }
 
 
-status_t 
+status_t
 load_kernel(stage2_args *args, Directory *volume)
 {
 	int fd = open_from(volume, KERNEL_PATH, O_RDONLY);
@@ -75,6 +75,8 @@ load_kernel(stage2_args *args, Directory *volume)
 		return status;
 	}
 
+	gKernelArgs.kernel_image.name = kernel_args_strdup(KERNEL_IMAGE);
+
 	return B_OK;
 }
 
@@ -162,7 +164,7 @@ load_module(Directory *volume, const char *name)
 }
 
 
-status_t 
+status_t
 load_modules(stage2_args *args, Directory *volume)
 {
 	int32 failed = 0;
diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp
index a446a02960..d6ab9302b8 100644
--- a/src/system/kernel/vm/vm.cpp
+++ b/src/system/kernel/vm/vm.cpp
@@ -4052,8 +4052,6 @@ vm_init(kernel_args *args)
 
 	allocate_kernel_args(args);
 
-	args->kernel_image.name = "kernel";
-		// the lazy boot loader currently doesn't set the kernel's name...
 	create_preloaded_image_areas(&args->kernel_image);
 
 	// allocate areas for preloaded images