[rfc][patch 3/3] x86: Use bootmem2 on x86_32

Johannes Weiner
2008-05-05T09:59:41Z

[-- Attachment #1: bootmem2-migrate-x86_32.patch --]
[-- Type: text/plain, Size: 1775 bytes --]

Straight-forward migration to use bootmem2 on the author's computer.

Signed-off-by: Johannes Weiner <hannes@saeurebad.de>
---

Index: linux-2.6/arch/x86/kernel/setup_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_32.c
+++ linux-2.6/arch/x86/kernel/setup_32.c
@@ -641,7 +641,9 @@ void __init setup_bootmem_allocator(void
/*
* Initialize the boot-time allocator (with low memory only):
*/
- bootmap_size = init_bootmem(min_low_pfn, max_low_pfn);
+ bootmem_register(0, max_low_pfn);
+ bootmap_size = bootmem_map_pages() << PAGE_SHIFT;
+ bootmem_setup(min_low_pfn);

register_bootmem_low_pages(max_low_pfn);

Index: linux-2.6/arch/x86/mm/init_32.c
===================================================================
--- linux-2.6.orig/arch/x86/mm/init_32.c
+++ linux-2.6/arch/x86/mm/init_32.c
@@ -585,7 +585,7 @@ void __init mem_init(void)
}
#endif
/* this will put all low memory onto the freelists */
- totalram_pages += free_all_bootmem();
+ totalram_pages += bootmem_release();

reservedpages = 0;
for (tmp = 0; tmp < max_low_pfn; tmp++)
Index: linux-2.6/arch/x86/Kconfig
===================================================================
--- linux-2.6.orig/arch/x86/Kconfig
+++ linux-2.6/arch/x86/Kconfig
@@ -24,6 +24,7 @@ config X86
select HAVE_KRETPROBES
select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
select HAVE_ARCH_KGDB if !X86_VOYAGER
+ select HAVE_BOOTMEM2 if X86_32

config DEFCONFIG_LIST
string