diff options
author | 2018-07-03 09:20:22 +0200 | |
---|---|---|
committer | 2018-07-03 09:20:22 +0200 | |
commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /arch/x86/entry/entry_32.S | |
parent | sched/fair: Remove stale tg_unthrottle_up() comments (diff) | |
parent | kthread, sched/core: Fix kthread_parkme() (again...) (diff) | |
download | linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.zip |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_32.S')
-rw-r--r-- | arch/x86/entry/entry_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 2582881d19ce..c371bfee137a 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -477,7 +477,7 @@ ENTRY(entry_SYSENTER_32) * whereas POPF does not.) */ addl $PT_EFLAGS-PT_DS, %esp /* point esp at pt_regs->flags */ - btr $X86_EFLAGS_IF_BIT, (%esp) + btrl $X86_EFLAGS_IF_BIT, (%esp) popfl /* |