x86/init: use linker table for mid early setup
Using the linker table removes the need for the #ifdef'ery
and clutter on head32.c.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index f1e111a..1345c1d 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -45,12 +45,6 @@
extern void i386_reserve_resources(void);
extern void setup_default_timer_irq(void);
-#ifdef CONFIG_X86_INTEL_MID
-extern void x86_intel_mid_early_setup(void);
-#else
-static inline void x86_intel_mid_early_setup(void) { }
-#endif
-
#ifndef _SETUP
#include <asm/espfix.h>
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index ec69128..b23d16a 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -36,13 +36,6 @@
cr4_init_shadow();
sanitize_boot_params(&boot_params);
- /* Call the subarch specific early setup function */
- switch (boot_params.hdr.hardware_subarch) {
- case X86_SUBARCH_INTEL_MID:
- x86_intel_mid_early_setup();
- break;
- }
-
x86_init_fn_init_tables();
x86_init_fn_early_init();
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 1bbc21e..27bc331 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -167,7 +167,7 @@
* Moorestown specific x86_init function overrides and early setup
* calls.
*/
-void __init x86_intel_mid_early_setup(void)
+static void __init x86_intel_mid_early_setup(void)
{
x86_init.resources.probe_roms = x86_init_noop;
x86_init.resources.reserve_resources = x86_init_noop;
@@ -199,6 +199,8 @@
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
set_bit(MP_BUS_ISA, mp_bus_not_pci);
}
+x86_init_early(BIT(X86_SUBARCH_INTEL_MID), NULL, NULL,
+ x86_intel_mid_early_setup);
/*
* if user does not want to use per CPU apb timer, just give it a lower rating
