Merge branch 'x86/urgent' into x86/cleanups

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

diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
index 3810d14051e853b5014d131812f03aba5bd04bc7..ab8528793f081bef8d7c945b7bddbaf1bff54073 100644 (file)
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@ -93,8 +93,9 @@ extern int sysctl_legacy_va_layout;
 #define MAXMEM                 (-__PAGE_OFFSET - __VMALLOC_RESERVE)
 
 extern void find_low_pfn_range(void);
+extern unsigned long init_memory_mapping(unsigned long start,
+                                        unsigned long end);
 extern void initmem_init(unsigned long, unsigned long);
-extern void zone_sizes_init(void);
 extern void setup_bootmem_allocator(void);