x86: Merge early kernel reserve for 32bit and 64bit

They are the same, and we could move them out from head32/64.c to setup.c.

We are using memblock, and it could handle overlapping properly, so
we don't need to reserve some at first to hold the location, and just
need to make sure we reserve them before we are using memblock to find
free mem to use.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-32-git-send-email-yinghai@kernel.org
Cc: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

3 files changed, 9 insertions, 18 deletions

diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index a795b54de7d3..138463a24877 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -33,9 +33,6 @@ void __init i386_start_kernel(void)
 {
         sanitize_boot_params(&boot_params);
 
-        memblock_reserve(__pa_symbol(&_text),
-                         __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
-
         /* Call the subarch specific early setup function */
         switch (boot_params.hdr.hardware_subarch) {
         case X86_SUBARCH_MRST:
@@ -49,11 +46,5 @@ void __init i386_start_kernel(void)
                 break;
         }
 
-        /*
-         * At this point everything still needed from the boot loader
-         * or BIOS or kernel text should be early reserved or marked not
-         * RAM in e820. All other memory is free game.
-         */
-
         start_kernel();
 }
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 6873b070d72c..57334f4cd3af 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -186,16 +186,7 @@ void __init x86_64_start_reservations(char *real_mode_data)
         if (!boot_params.hdr.version)
                 copy_bootdata(__va(real_mode_data));
 
-        memblock_reserve(__pa_symbol(&_text),
-                         __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
-
         reserve_ebda_region();
 
-        /*
-         * At this point everything still needed from the boot loader
-         * or BIOS or kernel text should be early reserved or marked not
-         * RAM in e820. All other memory is free game.
-         */
-
         start_kernel();
 }
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 5dc47c3e537b..a74701af74e3 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -805,8 +805,17 @@ early_param("reservelow", parse_reservelow);
 
 void __init setup_arch(char **cmdline_p)
 {
+        memblock_reserve(__pa_symbol(_text),
+                         (unsigned long)__bss_stop - (unsigned long)_text);
+
         early_reserve_initrd();
 
+        /*
+         * At this point everything still needed from the boot loader
+         * or BIOS or kernel text should be early reserved or marked not
+         * RAM in e820. All other memory is free game.
+         */
+
 #ifdef CONFIG_X86_32
         memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
         visws_early_detect();