Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/scjody...

[powerpc.git] / include / asm-ia64 / meminit.h

diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h
index 74477fc..46501b0 100644 (file)
--- 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