From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760841AbcBYPRG (ORCPT ); Thu, 25 Feb 2016 10:17:06 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:17890 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760779AbcBYPRE (ORCPT ); Thu, 25 Feb 2016 10:17:04 -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, Boris Ostrovsky Subject: [PATCH v3 2/2] xen/x86: Drop mode-selecting ifdefs in startup_xen() 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] 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 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 -- 2.1.0