diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-06-25 00:19:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 07:13:15 -0400 |
commit | d75cd22fdd5f7d203fb60014d426942df33dd9a6 (patch) | |
tree | 0613fca9d594eab9a0679f80510fa11b48b31571 /include/asm-x86/irqflags.h | |
parent | e04e0a630d8b5c621b3a8e70ff20db737d3a5728 (diff) |
x86/paravirt: split sysret and sysexit
Don't conflate sysret and sysexit; they're different instructions with
different semantics, and may be in use at the same time (at least
within the same kernel, depending on whether its an Intel or AMD
system).
sysexit - just return to userspace, does no register restoration of
any kind; must explicitly atomically enable interrupts.
sysret - reloads flags from r11, so no need to explicitly enable
interrupts on 64-bit, responsible for restoring usermode %gs
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citirx.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/irqflags.h')
-rw-r--r-- | include/asm-x86/irqflags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index c242527f970e..99ee5256a7e3 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
@@ -112,13 +112,13 @@ static inline unsigned long __raw_local_irq_save(void) | |||
112 | 112 | ||
113 | #ifdef CONFIG_X86_64 | 113 | #ifdef CONFIG_X86_64 |
114 | #define INTERRUPT_RETURN iretq | 114 | #define INTERRUPT_RETURN iretq |
115 | #define ENABLE_INTERRUPTS_SYSCALL_RET \ | 115 | #define USERSP_SYSRET \ |
116 | movq %gs:pda_oldrsp, %rsp; \ | 116 | movq %gs:pda_oldrsp, %rsp; \ |
117 | swapgs; \ | 117 | swapgs; \ |
118 | sysretq; | 118 | sysretq; |
119 | #else | 119 | #else |
120 | #define INTERRUPT_RETURN iret | 120 | #define INTERRUPT_RETURN iret |
121 | #define ENABLE_INTERRUPTS_SYSCALL_RET sti; sysexit | 121 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |
122 | #define GET_CR0_INTO_EAX movl %cr0, %eax | 122 | #define GET_CR0_INTO_EAX movl %cr0, %eax |
123 | #endif | 123 | #endif |
124 | 124 | ||