diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/x86/xen/xen-asm_64.S | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/x86/xen/xen-asm_64.S')
| -rw-r--r-- | arch/x86/xen/xen-asm_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index 02f496a8dbaa..53adefda4275 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S | |||
| @@ -96,7 +96,7 @@ ENTRY(xen_sysret32) | |||
| 96 | pushq $__USER32_CS | 96 | pushq $__USER32_CS |
| 97 | pushq %rcx | 97 | pushq %rcx |
| 98 | 98 | ||
| 99 | pushq $VGCF_in_syscall | 99 | pushq $0 |
| 100 | 1: jmp hypercall_iret | 100 | 1: jmp hypercall_iret |
| 101 | ENDPATCH(xen_sysret32) | 101 | ENDPATCH(xen_sysret32) |
| 102 | RELOC(xen_sysret32, 1b+1) | 102 | RELOC(xen_sysret32, 1b+1) |
| @@ -151,7 +151,7 @@ ENTRY(xen_syscall32_target) | |||
| 151 | ENTRY(xen_sysenter_target) | 151 | ENTRY(xen_sysenter_target) |
| 152 | lea 16(%rsp), %rsp /* strip %rcx, %r11 */ | 152 | lea 16(%rsp), %rsp /* strip %rcx, %r11 */ |
| 153 | mov $-ENOSYS, %rax | 153 | mov $-ENOSYS, %rax |
| 154 | pushq $VGCF_in_syscall | 154 | pushq $0 |
| 155 | jmp hypercall_iret | 155 | jmp hypercall_iret |
| 156 | ENDPROC(xen_syscall32_target) | 156 | ENDPROC(xen_syscall32_target) |
| 157 | ENDPROC(xen_sysenter_target) | 157 | ENDPROC(xen_sysenter_target) |