From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Fri, 26 Feb 2016 19:02:37 +0000 (-0500)
Subject: xen/x86: Drop mode-selecting ifdefs in startup_xen()
X-Git-Tag: v4.6-rc1~51^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4478c407ea3810aad300ef8d4cee23b3d708461b;p=karo-tx-linux.git

xen/x86: Drop mode-selecting ifdefs in startup_xen()

Use asm/asm.h macros instead.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---

diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 5c63d2d955bb..de93b20fa0d2 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