x86: move some function out of setup_bootmem_alloc

... to make it more like 64-bit.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 16 insertions, 15 deletions

diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index 9692aeb8ecae..90a2b857b4a7 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -623,21 +623,6 @@ void __init setup_bootmem_allocator(void)
                 free_bootmem_with_active_regions(i, max_low_pfn);
         early_res_to_bootmem(0, max_low_pfn<<PAGE_SHIFT);
 
-#ifdef CONFIG_ACPI_SLEEP
-        /*
-         * Reserve low memory region for sleep support.
-         */
-        acpi_reserve_bootmem();
-#endif
-#ifdef CONFIG_X86_FIND_SMP_CONFIG
-        /*
-         * Find and reserve possible boot-time SMP configuration:
-         */
-        find_smp_config();
-#endif
-        reserve_crashkernel();
-
-        reserve_ibft_region();
 }
 
 /*
@@ -792,6 +777,22 @@ void __init setup_arch(char **cmdline_p)
 
         max_low_pfn = setup_memory();
 
+#ifdef CONFIG_ACPI_SLEEP
+        /*
+         * Reserve low memory region for sleep support.
+         */
+        acpi_reserve_bootmem();
+#endif
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
+        /*
+         * Find and reserve possible boot-time SMP configuration:
+         */
+        find_smp_config();
+#endif
+        reserve_crashkernel();
+
+        reserve_ibft_region();
+
 #ifdef CONFIG_KVM_CLOCK
         kvmclock_init();
 #endif