summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-06-21 13:12:34 +0200
committerIngo Molnar <mingo@kernel.org>2021-06-22 13:56:42 +0200
commit240001d4e3041832e8a2654adc3ccf1683132b92 (patch)
tree6430ecdfbff6af5c2c4dbffaa0e137971df990f1
parent31197d3a0f1caeb60fb01f6755e28347e4f44037 (diff)
x86/entry: Fix noinstr fail in __do_fast_syscall_32()
Fix: vmlinux.o: warning: objtool: __do_fast_syscall_32()+0xf5: call to trace_hardirqs_off() leaves .noinstr.text section Fixes: 5d5675df792f ("x86/entry: Fix entry/exit mismatch on failed fast 32-bit syscalls") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20210621120120.467898710@infradead.org
-rw-r--r--arch/x86/entry/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 7b2542b13ebd..a6bf516257ec 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -130,8 +130,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)
/* User code screwed up. */
regs->ax = -EFAULT;
- instrumentation_end();
local_irq_disable();
+ instrumentation_end();
irqentry_exit_to_user_mode(regs);
return false;
}