diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-10-28 23:32:30 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 23:32:30 +0200 |
| commit | 5833f1420b96c4f9b193b7f2fcbc0003dc032fe8 (patch) | |
| tree | ccb3933b3c694ba4724c3a392d6e275d992ed86b /include/asm-ia64 | |
| parent | Pull define-node-cleanup into release branch (diff) | |
| parent | [IA64] end of kernel 'data' is at _end, not _edata (diff) | |
| download | linux-5833f1420b96c4f9b193b7f2fcbc0003dc032fe8.tar.xz linux-5833f1420b96c4f9b193b7f2fcbc0003dc032fe8.zip | |
Pull new-efi-memmap into release branch
Diffstat (limited to 'include/asm-ia64')
| -rw-r--r-- | include/asm-ia64/meminit.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h index 1590dc65b30b..90646632237c 100644 --- a/include/asm-ia64/meminit.h +++ b/include/asm-ia64/meminit.h @@ -16,10 +16,11 @@ * - initrd (optional) * - command line string * - kernel code & data + * - Kernel memory map built from EFI memory map * * More could be added if necessary */ -#define IA64_MAX_RSVD_REGIONS 5 +#define IA64_MAX_RSVD_REGIONS 6 struct rsvd_region { unsigned long start; /* virtual address of beginning of element */ @@ -33,6 +34,7 @@ extern void find_memory (void); extern void reserve_memory (void); extern void find_initrd (void); extern int filter_rsvd_memory (unsigned long start, unsigned long end, void *arg); +extern void efi_memmap_init(unsigned long *, unsigned long *); /* * For rounding an address to the next IA64_GRANULE_SIZE or order |