diff options
Diffstat (limited to 'arch/x86/xen/xen-asm_64.S')
| -rw-r--r-- | arch/x86/xen/xen-asm_64.S | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index a8a4f4c460a6..c5fee2680abc 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S @@ -88,6 +88,15 @@ RELOC(xen_sysret64, 1b+1) ENTRY(xen_syscall_target) popq %rcx popq %r11 + + /* + * Neither Xen nor the kernel really knows what the old SS and + * CS were. The kernel expects __USER_DS and __USER_CS, so + * report those values even though Xen will guess its own values. + */ + movq $__USER_DS, 4*8(%rsp) + movq $__USER_CS, 1*8(%rsp) + jmp entry_SYSCALL_64_after_hwframe ENDPROC(xen_syscall_target) @@ -97,6 +106,15 @@ ENDPROC(xen_syscall_target) ENTRY(xen_syscall32_target) popq %rcx popq %r11 + + /* + * Neither Xen nor the kernel really knows what the old SS and + * CS were. The kernel expects __USER32_DS and __USER32_CS, so + * report those values even though Xen will guess its own values. + */ + movq $__USER32_DS, 4*8(%rsp) + movq $__USER32_CS, 1*8(%rsp) + jmp entry_SYSCALL_compat_after_hwframe ENDPROC(xen_syscall32_target) |