diff options
| author | Ingo Molnar | 2016-03-07 09:27:30 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2016-03-07 09:27:30 +0100 |
| commit | ec87e1cf7d8399d81d8965c6d852f8057a8dd687 (patch) | |
| tree | 472a168fa4861090edf110c8a9712a5c15ea259f /arch/x86/entry | |
| parent | 869ae76147ffdf21ad24f0e599303cd58a2bb39f (diff) | |
| parent | f6cede5b49e822ebc41a099fe41ab4989f64e2cb (diff) | |
Merge tag 'v4.5-rc7' into x86/asm, to pick up SMAP fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_32.S | 1 | ||||
| -rw-r--r-- | arch/x86/entry/entry_64_compat.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 4c5228352744..66350e6a6ca5 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -294,6 +294,7 @@ sysenter_past_esp: pushl $__USER_DS /* pt_regs->ss */ pushl %ebp /* pt_regs->sp (stashed in bp) */ pushfl /* pt_regs->flags (except IF = 0) */ + ASM_CLAC /* Clear AC after saving FLAGS */ orl $X86_EFLAGS_IF, (%esp) /* Fix IF */ pushl $__USER_CS /* pt_regs->cs */ pushl $0 /* pt_regs->ip = 0 (placeholder) */ diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index ff1c6d61f332..3c990eeee40b 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S @@ -261,6 +261,7 @@ ENTRY(entry_INT80_compat) * Interrupts are off on entry. */ PARAVIRT_ADJUST_EXCEPTION_FRAME + ASM_CLAC /* Do this early to minimize exposure */ SWAPGS /* |