From patchwork Fri Feb 19 14:15:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8361661 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C977C9F372 for ; Fri, 19 Feb 2016 14:18:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03927204A2 for ; Fri, 19 Feb 2016 14:18:34 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56E072047B for ; Fri, 19 Feb 2016 14:18:32 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWlqq-0005vT-3C; Fri, 19 Feb 2016 14:16:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWlqo-0005sx-PJ for xen-devel@lists.xensource.com; Fri, 19 Feb 2016 14:16:06 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 51/76-03606-5A327C65; Fri, 19 Feb 2016 14:16:05 +0000 X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-12.tower-31.messagelabs.com!1455891364!23575476!1 X-Originating-IP: [198.145.29.136] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21985 invoked from network); 19 Feb 2016 14:16:05 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-12.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Feb 2016 14:16:05 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3ECB5204AB; Fri, 19 Feb 2016 14:15:58 +0000 (UTC) Received: from garbanzo.do-not-panic.com (c-73-15-241-2.hsd1.ca.comcast.net [73.15.241.2]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0113A204C9; Fri, 19 Feb 2016 14:15:56 +0000 (UTC) From: "Luis R. Rodriguez" To: hpa@zytor.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de Date: Fri, 19 Feb 2016 06:15:42 -0800 Message-Id: <1455891343-10016-6-git-send-email-mcgrof@kernel.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455891343-10016-1-git-send-email-mcgrof@kernel.org> References: <1455891343-10016-1-git-send-email-mcgrof@kernel.org> X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Cc: jgross@suse.com, rusty@rustcorp.com.au, x86@kernel.org, linux-kernel@vger.kernel.org, luto@amacapital.net, "Luis R. Rodriguez" , xen-devel@lists.xensource.com, david.vrabel@citrix.com, boris.ostrovsky@oracle.com, andriy.shevchenko@linux.intel.com, mcb30@ipxe.org Subject: [Xen-devel] [RFC v2 5/6] x86/init: user linker table for ce4100 early setup X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Virus-Scanned: ClamAV using ClamSMTP 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 | 3 --- arch/x86/platform/ce4100/ce4100.c | 4 +++- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 11af24e09c8a..f1e111a9d558 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -51,12 +51,6 @@ extern void x86_intel_mid_early_setup(void); static inline void x86_intel_mid_early_setup(void) { } #endif -#ifdef CONFIG_X86_INTEL_CE -extern void x86_ce4100_early_setup(void); -#else -static inline void x86_ce4100_early_setup(void) { } -#endif - #ifndef _SETUP #include diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index 0b41626e57fc..9357feb09863 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -42,9 +42,6 @@ asmlinkage __visible void __init i386_start_kernel(void) case X86_SUBARCH_INTEL_MID: x86_intel_mid_early_setup(); break; - case X86_SUBARCH_CE4100: - x86_ce4100_early_setup(); - break; } x86_init_fn_init_tables(); diff --git a/arch/x86/platform/ce4100/ce4100.c b/arch/x86/platform/ce4100/ce4100.c index 701fd5843c87..db2a709402e2 100644 --- a/arch/x86/platform/ce4100/ce4100.c +++ b/arch/x86/platform/ce4100/ce4100.c @@ -24,6 +24,7 @@ #include #include #include +#include static int ce4100_i8042_detect(void) { @@ -144,7 +145,7 @@ static void sdv_pci_init(void) * CE4100 specific x86_init function overrides and early setup * calls. */ -void __init x86_ce4100_early_setup(void) +static void __init x86_ce4100_early_setup(void) { x86_init.oem.arch_setup = sdv_arch_setup; x86_platform.i8042_detect = ce4100_i8042_detect; @@ -166,3 +167,4 @@ void __init x86_ce4100_early_setup(void) pm_power_off = ce4100_power_off; } +x86_init_early(BIT(X86_SUBARCH_CE4100), NULL, NULL, x86_ce4100_early_setup);