Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-x86 / e820_32.h

diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h
index ae5ea19623faf9c33c8a39abad80f812140283c1..f1da7ebd19051dd040ce24f77db73ef02eee8ff3 100644 (file)
--- a/include/asm-x86/e820_32.h
+++ b/include/asm-x86/e820_32.h
@@ -19,16 +19,19 @@
 #ifndef __ASSEMBLY__
 
 extern struct e820map e820;
+extern void update_e820(void);
 
 extern int e820_all_mapped(unsigned long start, unsigned long end,
                           unsigned type);
 extern int e820_any_mapped(u64 start, u64 end, unsigned type);
 extern void find_max_pfn(void);
 extern void register_bootmem_low_pages(unsigned long max_low_pfn);
+extern void add_memory_region(unsigned long long start,
+                             unsigned long long size, int type);
 extern void e820_register_memory(void);
 extern void limit_regions(unsigned long long size);
 extern void print_memory_map(char *who);
-extern void legacy_init_iomem_resources(struct resource *code_resource,
+extern void init_iomem_resources(struct resource *code_resource,
                            struct resource *data_resource,
                            struct resource *bss_resource);