From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754939AbcBZTDV (ORCPT ); Fri, 26 Feb 2016 14:03:21 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:28583 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbcBZTDT (ORCPT ); Fri, 26 Feb 2016 14:03:19 -0500 From: Boris Ostrovsky To: konrad.wilk@oracle.com, david.vrabel@citrix.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, mcgrof@kernel.org, brgerst@gmail.com, andrew.cooper3@citrix.com, roger.pau@citrix.com, Boris Ostrovsky Subject: [PATCH v4 2/2] xen/x86: Drop mode-selecting ifdefs in startup_xen() Date: Fri, 26 Feb 2016 14:02:37 -0500 Message-Id: <1456513357-19981-3-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1456513357-19981-1-git-send-email-boris.ostrovsky@oracle.com> References: <1456513357-19981-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 5c63d2d..de93b20 100644 --- a/arch/x86/xen/xen-head.S +++ b/arch/x86/xen/xen-head.S @@ -47,13 +47,9 @@ ENTRY(startup_xen) shr $__ASM_SEL(2, 3), %_ASM_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_SI, xen_start_info + mov $init_thread_union+THREAD_SIZE, %_ASM_SP + jmp xen_start_kernel __FINIT -- 2.1.0