diff options
| author | neal <neal> | 2007-07-30 11:37:56 +0000 |
|---|---|---|
| committer | neal <neal> | 2007-07-30 11:37:56 +0000 |
| commit | 11347b8ad0317dd4ba81b24339433e08b3a2b88f (patch) | |
| tree | c81ebec3fa30e41f2789e92fd9f4e3a1fd9fa72b /laden/laden.c | |
| parent | fc2faf17beb29b5c4527aa7bcf59771073f1e25f (diff) | |
2007-07-30 Neal H. Walfield <neal@gnu.org>
* kip-fixup.c (kip_fixup): Use a symbolic name rather than a magic
number.
[_L4_X2]: Set KIP->MEMORY_INFO.NR to MEMORY_MAP_SIZE.
* laden.c (load_components): Don't add L4 memory maps
corresponding to the the kernel's, sigma0's, sigma1's or the root
task's image.
* loader.c (mem_check): Add debugging output.
(loader_regions_reserve): Round USED_REGIONS[I].START and
USED_REGIONS[I].END appropriately.
Diffstat (limited to 'laden/laden.c')
| -rw-r--r-- | laden/laden.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/laden/laden.c b/laden/laden.c index 934873c..44030cb 100644 --- a/laden/laden.c +++ b/laden/laden.c @@ -78,13 +78,11 @@ load_components (void) /* Since we did not panic, there are no conflicts and we can now unpack the images. */ loader_elf_load ("kernel", kernel.low, kernel.high, - &kernel.low, &kernel.high, &kernel.ip, - L4_MEMDESC_RESERVED); + &kernel.low, &kernel.high, &kernel.ip, -1); loader_remove_region ("kernel-mod"); loader_elf_load ("sigma0", sigma0.low, sigma0.high, - &sigma0.low, &sigma0.high, &sigma0.ip, - L4_MEMDESC_RESERVED); + &sigma0.low, &sigma0.high, &sigma0.ip, -1); loader_remove_region ("sigma0-mod"); #ifdef _L4_V2 /* Use the page following the extracted image as the stack. */ @@ -95,14 +93,12 @@ load_components (void) if (sigma1.low) { loader_elf_load ("sigma1", sigma1.low, sigma1.high, - &sigma1.low, &sigma1.high, &sigma1.ip, - L4_MEMDESC_RESERVED); + &sigma1.low, &sigma1.high, &sigma1.ip, -1); loader_remove_region ("sigma1-mod"); } loader_elf_load ("rootserver", rootserver.low, rootserver.high, - &rootserver.low, &rootserver.high, &rootserver.ip, - L4_MEMDESC_BOOTLOADER); + &rootserver.low, &rootserver.high, &rootserver.ip, -1); loader_remove_region ("rootserver-mod"); #ifdef _L4_V2 /* Use the page following the extracted image as the stack. */ |