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

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

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7707 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-05-31 22:54:43 +00:00
parent bc6ab31951
commit cbb2b6c19f
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/boot/loader/loader.cpp
+3 -10
View File
@@ -56,8 +56,7 @@ load_kernel(stage2_args *args, Directory *volume)
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 @@ load_kernel(stage2_args *args, Directory *volume)
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;
}