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 3db0590..138463a 100644 (file)
@@ -7,8 +7,44 @@
 
 #include <linux/init.h>
 #include <linux/start_kernel.h>
+#include <linux/mm.h>
+#include <linux/memblock.h>
+
+#include <asm/setup.h>
+#include <asm/sections.h>
+#include <asm/e820.h>
+#include <asm/page.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)
+{
+       /* Initialize 32bit specific setup functions */
+       x86_init.resources.reserve_resources = i386_reserve_resources;
+       x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc;
+
+       reserve_ebda_region();
+}
 
 void __init i386_start_kernel(void)
 {
+       sanitize_boot_params(&boot_params);
+
+       /* Call the subarch specific early setup function */
+       switch (boot_params.hdr.hardware_subarch) {
+       case X86_SUBARCH_MRST:
+               x86_mrst_early_setup();
+               break;
+       case X86_SUBARCH_CE4100:
+               x86_ce4100_early_setup();
+               break;
+       default:
+               i386_default_early_setup();
+               break;
+       }
+
        start_kernel();
 }