⛏️ index : haiku.git

cbb2b6c19f8255b5db42245edaa65e95afde163e [patch]

a9ea26ddd35b60793b7bab2c05f8495bcf6b274c

bc6ab319516d78b5b3ea7b53bcb9abb963b64c10

cbb2b6c19f8255b5db42245edaa65e95afde163e.tar.gz

The kernel image data is now maintained in a preloaded_image as well.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7707 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 src/kernel/boot/loader/loader.cpp | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/kernel/boot/loader/loader.cpp b/src/kernel/boot/loader/loader.cpp
index de950b7..bac3f58 100644
--- a/src/kernel/boot/loader/loader.cpp
+++ b/src/kernel/boot/loader/loader.cpp
@@ -56,8 +56,7 @@

	puts("load kernel...");

	preloaded_image image;
	status_t status = elf_load_image(fd, &image);
	status_t status = elf_load_image(fd, &gKernelArgs.kernel_image);

	close(fd);

@@ -68,14 +67,8 @@

	puts("kernel loaded successfully");

	// init kernel args with loaded image data
	gKernelArgs.kernel_seg0_addr.start = image.text_region.start;
	gKernelArgs.kernel_seg0_addr.size = image.text_region.size;
	gKernelArgs.kernel_seg1_addr.start = image.data_region.start;
	gKernelArgs.kernel_seg1_addr.size = image.data_region.size;
	gKernelArgs.kernel_dynamic_section_addr = image.dynamic_section;

	gKernelEntry = image.elf_header.e_entry;
	gKernelEntry = gKernelArgs.kernel_image.elf_header.e_entry;
		// ToDo: gKernelEntry is no longer needed

	return B_OK;
}