From patchwork Thu Feb 25 15:16:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 8424561 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 D4DA69F52D for ; Thu, 25 Feb 2016 15:19:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 086EF20377 for ; Thu, 25 Feb 2016 15:19:49 +0000 (UTC) Received: from lists.xen.org (unknown [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2E1ED2035E for ; Thu, 25 Feb 2016 15:19:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxf7-0006sq-2V; Thu, 25 Feb 2016 15:17:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxf6-0006sQ-Hn for xen-devel@lists.xenproject.org; Thu, 25 Feb 2016 15:17:04 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id A9/A3-02987-FEA1FC65; Thu, 25 Feb 2016 15:17:03 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1456413421!25023326!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16386 invoked from network); 25 Feb 2016 15:17:03 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-4.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Feb 2016 15:17:03 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u1PFGtdQ024237 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Feb 2016 15:16:56 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u1PFGtQD002250 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Thu, 25 Feb 2016 15:16:55 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u1PFGtGZ025454; Thu, 25 Feb 2016 15:16:55 GMT Received: from dhcp-burlington7-2nd-B-east-10-152-55-162.usdhcp.oraclecorp.com.com (/10.152.20.106) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Feb 2016 07:16:54 -0800 From: Boris Ostrovsky To: konrad.wilk@oracle.com, david.vrabel@citrix.com Date: Thu, 25 Feb 2016 10:16:35 -0500 Message-Id: <1456413395-7679-3-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1456413395-7679-1-git-send-email-boris.ostrovsky@oracle.com> References: <1456413395-7679-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: andrew.cooper3@citrix.com, linux-kernel@vger.kernel.org, mcgrof@kernel.org, brgerst@gmail.com, xen-devel@lists.xenproject.org, Boris Ostrovsky Subject: [Xen-devel] [PATCH v3 2/2] xen/x86: Drop mode-selecting ifdefs in startup_xen() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,RDNS_NONE, UNPARSEABLE_RELAY autolearn=no 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 Use asm/asm.h macros instead. Signed-off-by: Boris Ostrovsky --- arch/x86/xen/xen-head.S | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S index 11dbe49..2366895 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -52,13 +52,9 @@ ENTRY(startup_xen) shr $WSIZE_SHIFT, %__ASM_REG(cx) rep __ASM_SIZE(stos) -#ifdef CONFIG_X86_32 - mov %esi,xen_start_info - mov $init_thread_union+THREAD_SIZE,%esp -#else - mov %rsi,xen_start_info - mov $init_thread_union+THREAD_SIZE,%rsp -#endif + mov %__ASM_REG(si), xen_start_info + mov $init_thread_union+THREAD_SIZE, %__ASM_REG(sp) + jmp xen_start_kernel __FINIT