Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965626AbbLOWRQ (ORCPT ); Tue, 15 Dec 2015 17:17:16 -0500 Received: from mail-pf0-f179.google.com ([209.85.192.179]:36736 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965592AbbLOWRK (ORCPT ); Tue, 15 Dec 2015 17:17:10 -0500 From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, konrad.wilk@oracle.com Cc: rusty@rustcorp.com.au, luto@amacapital.net, boris.ostrovsky@oracle.com, mcb30@ipxe.org, jgross@suse.com, JBeulich@suse.com, joro@8bytes.org, ryabinin.a.a@gmail.com, andreyknvl@google.com, long.wanglong@huawei.com, qiuxishi@huawei.com, aryabinin@virtuozzo.com, mchehab@osg.samsung.com, valentinrothberg@gmail.com, peter.senna@gmail.com, mcgrof@suse.com, x86@kernel.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org Subject: [RFC v1 8/8] x86/init: use linker table for mid early setup Date: Tue, 15 Dec 2015 14:16:37 -0800 Message-Id: <1450217797-19295-9-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com> References: <1450217797-19295-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2650 Lines: 77 From: "Luis R. Rodriguez" Using the linker table removes the need for the #ifdef'ery and clutter on head32.c. Signed-off-by: Luis R. Rodriguez --- arch/x86/include/asm/setup.h | 6 ------ arch/x86/kernel/head32.c | 7 ------- arch/x86/platform/intel-mid/intel-mid.c | 4 +++- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index f1e111a9d558..1345c1de7f99 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -45,12 +45,6 @@ extern void reserve_standard_io_resources(void); 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 diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index ec6912873395..b23d16a2a5d5 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -36,13 +36,6 @@ asmlinkage __visible void __init i386_start_kernel(void) 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 1bbc21e2e4ae..27bc33193a06 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -167,7 +167,7 @@ static unsigned char intel_mid_get_nmi_reason(void) * 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 @@ void __init x86_intel_mid_early_setup(void) 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 -- 2.6.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/