summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-15 08:59:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-15 08:59:45 -0800
commitd56cd25dc0dc3fdb79e1f1df8dc366dabff8ec54 (patch)
tree8193905210d6d7a43d801916675d453d5a69c282
parent04da1a14b9eae1dbc2ccc007b54f46771f9cb529 (diff)
parentefe191f1605a149b06eb0fe1ff975e7d3137c9bb (diff)
Merge tag 'core-urgent-2026-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core syscall fixes from Ingo Molnar: - Two generic syscall entry code fixes for return code data type definitions (Florian Bezdeka) * tag 'core-urgent-2026-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: entry: Complete syscall_enter_from_user_mode_work() to bool migration entry: Fix return type of syscall_trace_enter()
-rw-r--r--include/linux/entry-common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h
index fa2854fed1f2..15278416f886 100644
--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -62,7 +62,7 @@ void trace_syscall_enter(struct pt_regs *regs);
void trace_syscall_exit(struct pt_regs *regs, long ret);
void syscall_enter_audit(struct pt_regs *regs);
-static __always_inline long syscall_trace_enter(struct pt_regs *regs, unsigned long work,
+static __always_inline bool syscall_trace_enter(struct pt_regs *regs, unsigned long work,
long syscall)
{
/*
@@ -202,7 +202,7 @@ do { \
\
instrumentation_begin(); \
local_irq_enable(); \
- long _ret = syscall_enter_from_user_mode_work(regs, syscall); \
+ bool _ret = syscall_enter_from_user_mode_work(regs, syscall); \
instrumentation_end(); \
\
_ret; \