summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/xen-head.S
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>2016-02-26 14:02:37 -0500
committerDavid Vrabel <david.vrabel@citrix.com>2016-03-03 16:20:22 +0000
commit4478c407ea3810aad300ef8d4cee23b3d708461b (patch)
tree553f62c0dc15c664bd916509363ab5cfad7fe46d /arch/x86/xen/xen-head.S
parent04b6b4a56884327c1648c517f1f46a2638f04c9d (diff)
downloadlinux-4478c407ea3810aad300ef8d4cee23b3d708461b.tar.bz2
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>
Diffstat (limited to 'arch/x86/xen/xen-head.S')
-rw-r--r--arch/x86/xen/xen-head.S10
1 files changed, 3 insertions, 7 deletions
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