[PATCH v3 2/2] xen/x86: Drop mode-selecting ifdefs in startup_xen()

[Boris Ostrovsky]

Use asm/asm.h macros instead.

Signed-off-by: Boris Ostrovsky <boris.ostrov...@oracle.com>
---
 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