diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-21 14:12:34 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2021-06-30 15:47:17 +0300 |
| commit | cb83c99cf675f3d48a343f8a17d0b953996660cb (patch) | |
| tree | 5b23a56c159b6d0defac3754de45653071becb61 | |
| parent | cf593548759465bb3c40cedfe0913a150ca6bda8 (diff) | |
| download | linux-cb83c99cf675f3d48a343f8a17d0b953996660cb.tar.xz | |
x86/entry: Fix noinstr fail in __do_fast_syscall_32()
[ Upstream commit 240001d4e3041832e8a2654adc3ccf1683132b92 ]
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
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/x86/entry/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 2e4d91f3feea..93a3122cd15f 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -127,8 +127,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; } |