fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-ia64 / meminit.h

diff --git a/include/asm-ia64/meminit.h b/include/asm-ia64/meminit.h
index 46501b0..827480a 100644 (file)
--- a/include/asm-ia64/meminit.h
+++ b/include/asm-ia64/meminit.h
@@ -7,7 +7,6 @@
  * for more details.
  */
 
-#include <linux/config.h>
 
 /*
  * Entries defined so far:
@@ -16,11 +15,17 @@
  *     - initrd (optional)
  *     - command line string
  *     - kernel code & data
+ *     - crash dumping code reserved region
  *     - Kernel memory map built from EFI memory map
+ *     - xen start info
  *
  * More could be added if necessary
  */
-#define IA64_MAX_RSVD_REGIONS 6
+#ifndef CONFIG_XEN
+#define IA64_MAX_RSVD_REGIONS 7
+#else
+#define IA64_MAX_RSVD_REGIONS 8
+#endif
 
 struct rsvd_region {
        unsigned long start;    /* virtual address of beginning of element */
@@ -56,7 +61,13 @@ extern void efi_memmap_init(unsigned long *, unsigned long *);
   extern unsigned long vmalloc_end;
   extern struct page *vmem_map;
   extern int find_largest_hole (u64 start, u64 end, void *arg);
+  extern int register_active_ranges (u64 start, u64 end, void *arg);
   extern int create_mem_map_page_table (u64 start, u64 end, void *arg);
+  extern int vmemmap_find_next_valid_pfn(int, int);
+#else
+static inline int vmemmap_find_next_valid_pfn(int node, int i)
+{
+       return i + 1;
+}
 #endif
-
 #endif /* meminit_h */