mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
Merge branch into tip/master: 'core/urgent'
# New commits in core/urgent:
7b41ff29c8 ("entry: Kill ARCH_SYSCALL_WORK_{ENTER,EXIT}")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
commit
52cfe57e40
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user