summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2010-08-25 13:39:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-08-27 11:14:37 -0700
commit774ea0bcb27f57b6fd521b3b6c43237782fed4b9 (patch)
tree6a488cbf25b12318cb57b76810758115bc888808 /arch/x86/kernel/setup.c
parent6f2a75369e7561e800d86927ecd83c970996b21f (diff)
x86: Remove old bootmem code
Requested by Ingo, Thomas and HPA. The old bootmem code is no longer necessary, and the transition is complete. Remove it. Signed-off-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 924c8f78e98e..1d114ff6a078 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1014,10 +1014,6 @@ void __init setup_arch(char **cmdline_p)
initmem_init(0, max_pfn, acpi, k8);
memblock_find_dma_reserve();
-#ifndef CONFIG_NO_BOOTMEM
- memblock_x86_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);
-#endif
-
dma32_reserve_bootmem();
#ifdef CONFIG_KVM_CLOCK