From patchwork Fri Feb 19 14:15:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 8361641 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 6D8359F372 for ; Fri, 19 Feb 2016 14:18:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9538F20481 for ; Fri, 19 Feb 2016 14:18:22 +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 C25B42047B for ; Fri, 19 Feb 2016 14:18:21 +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 1aWlqk-0005qK-0x; Fri, 19 Feb 2016 14:16:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aWlqi-0005pC-55 for xen-devel@lists.xensource.com; Fri, 19 Feb 2016 14:16:00 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 58/E2-03449-F9327C65; Fri, 19 Feb 2016 14:15:59 +0000 X-Env-Sender: mcgrof@kernel.org X-Msg-Ref: server-7.tower-206.messagelabs.com!1455891357!23363573!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 7770 invoked from network); 19 Feb 2016 14:15:58 -0000 Received: from mail.kernel.org (HELO mail.kernel.org) (198.145.29.136) by server-7.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 19 Feb 2016 14:15:58 -0000 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9F4A2047B; Fri, 19 Feb 2016 14:15:56 +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 99E7D20497; Fri, 19 Feb 2016 14:15:55 +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:41 -0800 Message-Id: <1455891343-10016-5-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 4/6] x86/init: use linker table for i386 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 This also annotates this is only used for PC and lguest hardware subarchitectures. v2: add X86_SUBARCH_XEN as well, as noted by Konrad, now tested by 0-day bot. Signed-off-by: Luis R. Rodriguez --- arch/x86/kernel/head32.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c index 768fa3888066..0b41626e57fc 100644 --- a/arch/x86/kernel/head32.c +++ b/arch/x86/kernel/head32.c @@ -21,12 +21,16 @@ #include #include -static void __init i386_default_early_setup(void) +static void __init i386_set_setup_funcs(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; } +x86_init_early(BIT(X86_SUBARCH_PC) | + BIT(X86_SUBARCH_LGUEST) | + BIT(X86_SUBARCH_XEN), + NULL, NULL, i386_set_setup_funcs); asmlinkage __visible void __init i386_start_kernel(void) { @@ -41,9 +45,6 @@ asmlinkage __visible void __init i386_start_kernel(void) case X86_SUBARCH_CE4100: x86_ce4100_early_setup(); break; - default: - i386_default_early_setup(); - break; } x86_init_fn_init_tables();