diff options
Diffstat (limited to 'include/asm-x86/irqflags.h')
| -rw-r--r-- | include/asm-x86/irqflags.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index 544836c96b61..ea9bd2635d59 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
| @@ -112,9 +112,17 @@ 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 USERGS_SYSRET \ | 115 | #define USERGS_SYSRET64 \ |
| 116 | swapgs; \ | 116 | swapgs; \ |
| 117 | sysretq; | 117 | sysretq; |
| 118 | #define USERGS_SYSRET32 \ | ||
| 119 | swapgs; \ | ||
| 120 | sysretl | ||
| 121 | #define ENABLE_INTERRUPTS_SYSEXIT32 \ | ||
| 122 | swapgs; \ | ||
| 123 | sti; \ | ||
| 124 | sysexit | ||
| 125 | |||
| 118 | #else | 126 | #else |
| 119 | #define INTERRUPT_RETURN iret | 127 | #define INTERRUPT_RETURN iret |
| 120 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit | 128 | #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit |