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

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

diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h
index a0713d175f45b6c7b09e23d971c380c69d006f8f..ab8528793f081bef8d7c945b7bddbaf1bff54073 100644 (file)
--- a/include/asm-x86/page_32.h
+++ b/include/asm-x86/page_32.h
@@ -92,8 +92,10 @@ extern int sysctl_legacy_va_layout;
 #define VMALLOC_RESERVE                ((unsigned long)__VMALLOC_RESERVE)
 #define MAXMEM                 (-__PAGE_OFFSET - __VMALLOC_RESERVE)
 
-extern unsigned long initmem_init(unsigned long, unsigned long);
-extern void zone_sizes_init(void);
+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 setup_bootmem_allocator(void);