Skip to content

Commit 65e9974

Browse files
committed
Merge tag 'core-urgent-2026-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull entry cleanup from Ingo Molnar: "Remove the unused ARCH_SYSCALL_WORK_{ENTER,EXIT} flags" * tag 'core-urgent-2026-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: entry: Kill ARCH_SYSCALL_WORK_{ENTER,EXIT}
2 parents da6b5aa + 7b41ff2 commit 65e9974

1 file changed

Lines changed: 5 additions & 15 deletions

File tree

include/linux/entry-common.h

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,21 @@
2020
/*
2121
* SYSCALL_WORK flags handled in syscall_enter_from_user_mode()
2222
*/
23-
#ifndef ARCH_SYSCALL_WORK_ENTER
24-
# define ARCH_SYSCALL_WORK_ENTER (0)
25-
#endif
26-
27-
/*
28-
* SYSCALL_WORK flags handled in syscall_exit_to_user_mode()
29-
*/
30-
#ifndef ARCH_SYSCALL_WORK_EXIT
31-
# define ARCH_SYSCALL_WORK_EXIT (0)
32-
#endif
33-
3423
#define SYSCALL_WORK_ENTER (SYSCALL_WORK_SECCOMP | \
3524
SYSCALL_WORK_SYSCALL_TRACEPOINT | \
3625
SYSCALL_WORK_SYSCALL_TRACE | \
3726
SYSCALL_WORK_SYSCALL_EMU | \
3827
SYSCALL_WORK_SYSCALL_AUDIT | \
3928
SYSCALL_WORK_SYSCALL_USER_DISPATCH | \
40-
SYSCALL_WORK_SYSCALL_RSEQ_SLICE | \
41-
ARCH_SYSCALL_WORK_ENTER)
29+
SYSCALL_WORK_SYSCALL_RSEQ_SLICE)
30+
/*
31+
* SYSCALL_WORK flags handled in syscall_exit_to_user_mode()
32+
*/
4233
#define SYSCALL_WORK_EXIT (SYSCALL_WORK_SYSCALL_TRACEPOINT | \
4334
SYSCALL_WORK_SYSCALL_TRACE | \
4435
SYSCALL_WORK_SYSCALL_AUDIT | \
4536
SYSCALL_WORK_SYSCALL_USER_DISPATCH | \
46-
SYSCALL_WORK_SYSCALL_EXIT_TRAP | \
47-
ARCH_SYSCALL_WORK_EXIT)
37+
SYSCALL_WORK_SYSCALL_EXIT_TRAP)
4838

4939
/**
5040
* arch_ptrace_report_syscall_entry - Architecture specific ptrace_report_syscall_entry() wrapper

0 commit comments

Comments
 (0)