Merge branch 'x86/cpu' into x86/core

[deliverable/linux.git] / arch / x86 / xen / xen-asm_64.S

diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S
index 4038cbfe33319ac954b83437d45b9c189af052da..7f58304fafb3098fc68d35be4d9c02206077e8cb 100644 (file)
--- a/arch/x86/xen/xen-asm_64.S
+++ b/arch/x86/xen/xen-asm_64.S
@@ -173,7 +173,7 @@ ENTRY(xen_sysexit)
        pushq $__USER32_CS
        pushq %rdx
 
-       pushq $VGCF_in_syscall
+       pushq $0
 1:     jmp hypercall_iret
 ENDPATCH(xen_sysexit)
 RELOC(xen_sysexit, 1b+1)