diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:33:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 15:33:51 -0400 |
| commit | 6044110742bc2ae0577b962985e7c63e0634b2e9 (patch) | |
| tree | ab32f95f2b073d2bfcdf39909a718aa69ad127c6 /arch/x86/xen/xen-asm_64.S | |
| parent | 7540081c6b16dc941895bca840749cabfd0d3b48 (diff) | |
| parent | 04bbe430f73c6c31bbd067349c029e907e153a8d (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: fix header export, asm-x86/processor-flags.h, CONFIG_* leaks
x86: BUILD_IRQ say .text to avoid .data.percpu
xen: don't use sysret for sysexit32
x86: call early_cpu_init at the same point
Diffstat (limited to 'arch/x86/xen/xen-asm_64.S')
| -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) |