Skip to content

Commit 240001d

Browse files
Peter ZijlstraIngo Molnar
authored andcommitted
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: 5d5675d ("x86/entry: Fix entry/exit mismatch on failed fast 32-bit syscalls") Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 31197d3 commit 240001d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/entry/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ static noinstr bool __do_fast_syscall_32(struct pt_regs *regs)
130130
/* User code screwed up. */
131131
regs->ax = -EFAULT;
132132

133-
instrumentation_end();
134133
local_irq_disable();
134+
instrumentation_end();
135135
irqentry_exit_to_user_mode(regs);
136136
return false;
137137
}

0 commit comments

Comments
 (0)