diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /arch/x86/xen | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/xen-asm_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 4038cbfe3331..7f58304fafb3 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S | |||
| @@ -173,7 +173,7 @@ ENTRY(xen_sysexit) | |||
| 173 | pushq $__USER32_CS | 173 | pushq $__USER32_CS |
| 174 | pushq %rdx | 174 | pushq %rdx |
| 175 | 175 | ||
| 176 | pushq $VGCF_in_syscall | 176 | pushq $0 |
| 177 | 1: jmp hypercall_iret | 177 | 1: jmp hypercall_iret |
| 178 | ENDPATCH(xen_sysexit) | 178 | ENDPATCH(xen_sysexit) |
| 179 | RELOC(xen_sysexit, 1b+1) | 179 | RELOC(xen_sysexit, 1b+1) |