diff options
| author | neal <neal> | 2008-08-14 13:12:31 +0000 |
|---|---|---|
| committer | neal <neal> | 2008-08-14 13:12:31 +0000 |
| commit | 2f4992bc5b1f1e996c1a6b8139754459d4f76434 (patch) | |
| tree | 9fced7ffbd52650a37043df53ad4deec72272011 /laden/laden.h | |
| parent | 868ccb816257ccea6fdb6d99772c8a561d938e22 (diff) | |
2008-08-14 Neal H. Walfield <neal@gnu.org>
* laden.h: Include <stdint.h>.
(total_memory): New declaration.
* laden.c (total_memory): New definition.
(load_components): Remove V2 specific code.
* kip-fixup.c (kip_fixup): Remove V2 specific code.
* ia32-cmain.c (find_components): Add module regions as type -1,
not L4_MEMDESC_BOOTLOADER. Don't make total_memory a local
variable. Also calculate the total memory in the case where only
MBI->MEM_LOWER and MBI->MEM_UPPER are available. Move kernel
memory reservation from here...
* loader.c (loader_regions_reserve): ... to here. Implement more
robustly. Always add descriptors for
all memory regions with a type other than -1.
Diffstat (limited to 'laden/laden.h')
| -rw-r--r-- | laden/laden.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/laden/laden.h b/laden/laden.h index bf8bb18..567845d 100644 --- a/laden/laden.h +++ b/laden/laden.h @@ -1,5 +1,5 @@ /* laden.h - Generic definitions. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2008 Free Software Foundation, Inc. Written by Marcus Brinkmann. This file is part of the GNU Hurd. @@ -23,6 +23,7 @@ #endif #include <string.h> +#include <stdint.h> #include <assert.h> #include <l4.h> @@ -58,6 +59,11 @@ extern l4_rootserver_t rootserver; must provide this information. */ extern l4_word_t boot_info; +/* Total memory in bytes. To be filled in by the architecture + specific code (find_components). */ +extern uint64_t total_memory; + + /* The memory map to be provided to the kernel. */ #define MEMORY_MAP_MAX 200 extern l4_memory_desc_t memory_map[MEMORY_MAP_MAX]; |