summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2026-04-20 10:25:40 +0300
committerIngo Molnar <mingo@kernel.org>2026-04-20 10:25:40 +0300
commit52cfe57e40767d7312fd0de736e9e62545e59648 (patch)
tree2496b68233f6ae70008542a4ae431cee03d18bd3 /include/linux
parentc1f49dea2b8f335813d3b348fd39117fb8efb428 (diff)
parent7b41ff29c8d386257bae62ad557fd6bad8cc6787 (diff)
downloadlinux-52cfe57e40767d7312fd0de736e9e62545e59648.tar.xz
Merge branch into tip/master: 'core/urgent'
# New commits in core/urgent: 7b41ff29c8d3 ("entry: Kill ARCH_SYSCALL_WORK_{ENTER,EXIT}") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/entry-common.h20
1 files changed, 5 insertions, 15 deletions
diff --git a/include/linux/entry-common.h b/include/linux/entry-common.h
index e04d67e999a1..416a3352261f 100644
--- a/include/linux/entry-common.h
+++ b/include/linux/entry-common.h
@@ -20,31 +20,21 @@
/*
* SYSCALL_WORK flags handled in syscall_enter_from_user_mode()
*/
-#ifndef ARCH_SYSCALL_WORK_ENTER
-# define ARCH_SYSCALL_WORK_ENTER (0)
-#endif
-
-/*
- * SYSCALL_WORK flags handled in syscall_exit_to_user_mode()
- */
-#ifndef ARCH_SYSCALL_WORK_EXIT
-# define ARCH_SYSCALL_WORK_EXIT (0)
-#endif
-
#define SYSCALL_WORK_ENTER (SYSCALL_WORK_SECCOMP | \
SYSCALL_WORK_SYSCALL_TRACEPOINT | \
SYSCALL_WORK_SYSCALL_TRACE | \
SYSCALL_WORK_SYSCALL_EMU | \
SYSCALL_WORK_SYSCALL_AUDIT | \
SYSCALL_WORK_SYSCALL_USER_DISPATCH | \
- SYSCALL_WORK_SYSCALL_RSEQ_SLICE | \
- ARCH_SYSCALL_WORK_ENTER)
+ SYSCALL_WORK_SYSCALL_RSEQ_SLICE)
+/*
+ * SYSCALL_WORK flags handled in syscall_exit_to_user_mode()
+ */
#define SYSCALL_WORK_EXIT (SYSCALL_WORK_SYSCALL_TRACEPOINT | \
SYSCALL_WORK_SYSCALL_TRACE | \
SYSCALL_WORK_SYSCALL_AUDIT | \
SYSCALL_WORK_SYSCALL_USER_DISPATCH | \
- SYSCALL_WORK_SYSCALL_EXIT_TRAP | \
- ARCH_SYSCALL_WORK_EXIT)
+ SYSCALL_WORK_SYSCALL_EXIT_TRAP)
/**
* arch_ptrace_report_syscall_entry - Architecture specific ptrace_report_syscall_entry() wrapper