Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6

[~andy/linux] / include / asm-i386 / e820.h

diff --git a/include/asm-i386/e820.h b/include/asm-i386/e820.h
index edf65be21a9249a163e1fa187b6e79fa862cf054..c5b8fc6109d6cc0bc4214a347cc2c7583cbe0029 100644 (file)
--- a/include/asm-i386/e820.h
+++ b/include/asm-i386/e820.h
@@ -18,7 +18,7 @@
 
 #define E820_RAM       1
 #define E820_RESERVED  2
-#define E820_ACPI      3 /* usable as RAM once ACPI tables have been read */
+#define E820_ACPI      3
 #define E820_NVS       4
 
 #define HIGH_MEMORY    (1024*1024)
@@ -35,6 +35,15 @@ struct e820map {
 };
 
 extern struct e820map e820;
+
+extern int e820_all_mapped(unsigned long start, unsigned long end,
+                          unsigned type);
+extern void find_max_pfn(void);
+extern void register_bootmem_low_pages(unsigned long max_low_pfn);
+extern void e820_register_memory(void);
+extern void limit_regions(unsigned long long size);
+extern void print_memory_map(char *who);
+
 #endif/*!__ASSEMBLY__*/
 
 #endif/*__E820_HEADER*/