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 5c63d2d955bbaf715488da57433b0d8266ba3f32..de93b20fa0d28aaffaf91b327a7ab8a0bc1a70f0 100644 (file)
--- 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