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

Temporary fix for create_preloaded_image_areas. Will be replaced with a typedef later on.

Browse Source
This commit is contained in:
Alex Smith
2012-07-06 14:04:07 +01:00
parent e276cc0457
commit ab7726a2c4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/vm/vm.cpp
+9 -9
View File
@@ -3540,13 +3540,16 @@ vm_free_unused_boot_loader_range(addr_t start, addr_t size)
} }
// TODO x86_64: hardcoding elf32 is temporary.
static void static void
create_preloaded_image_areas(struct preloaded_elf32_image* image) create_preloaded_image_areas(struct preloaded_image* _image)
{ {
#ifdef __x86_64__ // TODO: Make this a typedef somewhere. Will be done when I implement
panic("fix this"); // ELF loading for x86_64.
#ifdef B_HAIKU_64_BIT
preloaded_elf64_image* image = static_cast<preloaded_elf64_image*>(_image);
#else #else
preloaded_elf32_image* image = static_cast<preloaded_elf32_image*>(_image);
#endif
char name[B_OS_NAME_LENGTH]; char name[B_OS_NAME_LENGTH];
void* address; void* address;
int32 length; int32 length;
@@ -3577,7 +3580,6 @@ create_preloaded_image_areas(struct preloaded_elf32_image* image)
image->data_region.id = create_area(name, &address, B_EXACT_ADDRESS, image->data_region.id = create_area(name, &address, B_EXACT_ADDRESS,
PAGE_ALIGN(image->data_region.size), B_ALREADY_WIRED, PAGE_ALIGN(image->data_region.size), B_ALREADY_WIRED,
B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA); B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA);
#endif
} }
@@ -3850,13 +3852,11 @@ vm_init(kernel_args* args)
allocate_kernel_args(args); allocate_kernel_args(args);
create_preloaded_image_areas(static_cast<struct preloaded_elf32_image*>( create_preloaded_image_areas(args->kernel_image);
(void*)args->kernel_image));
// allocate areas for preloaded images // allocate areas for preloaded images
for (image = args->preloaded_images; image != NULL; image = image->next) for (image = args->preloaded_images; image != NULL; image = image->next)
create_preloaded_image_areas( create_preloaded_image_areas(image);
static_cast<struct preloaded_elf32_image*>(image));
// allocate kernel stacks // allocate kernel stacks
for (i = 0; i < args->num_cpus; i++) { for (i = 0; i < args->num_cpus; i++) {