Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-3.10.git] / arch / x86 / kernel / head32.c
index 51ff186..138463a 100644 (file)
 #include <asm/sections.h>
 #include <asm/e820.h>
 #include <asm/page.h>
-#include <asm/trampoline.h>
 #include <asm/apic.h>
 #include <asm/io_apic.h>
 #include <asm/bios_ebda.h>
 #include <asm/tlbflush.h>
+#include <asm/bootparam_utils.h>
 
 static void __init i386_default_early_setup(void)
 {
@@ -31,19 +31,7 @@ static void __init i386_default_early_setup(void)
 
 void __init i386_start_kernel(void)
 {
-       memblock_reserve(__pa_symbol(&_text),
-                        __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       /* Reserve INITRD */
-       if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
-               /* Assume only end is not page aligned */
-               u64 ramdisk_image = boot_params.hdr.ramdisk_image;
-               u64 ramdisk_size  = boot_params.hdr.ramdisk_size;
-               u64 ramdisk_end   = PAGE_ALIGN(ramdisk_image + ramdisk_size);
-               memblock_reserve(ramdisk_image, ramdisk_end - ramdisk_image);
-       }
-#endif
+       sanitize_boot_params(&boot_params);
 
        /* Call the subarch specific early setup function */
        switch (boot_params.hdr.hardware_subarch) {
@@ -58,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();
 }