diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 14:36:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2021-09-30 14:36:36 +1000 |
| commit | 85131241135beb3ad35355e7ac5532e6d233962b (patch) | |
| tree | 552da31ab83e66a85a1c817986df535dd3066e36 | |
| parent | 9da5899ea6bbadd2d4de0f0645e470e19360d447 (diff) | |
| parent | a3be01837fc9f2c0f9f7356adec7222c0e199af8 (diff) | |
| download | devel-85131241135beb3ad35355e7ac5532e6d233962b.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git
# Conflicts:
# include/linux/sched/signal.h
| -rw-r--r-- | include/linux/sched/signal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h index e5f4ce622ee61a..1059197a92db5c 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -320,6 +320,7 @@ int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper); int force_sig_pkuerr(void __user *addr, u32 pkey); int force_sig_perf(void __user *addr, u32 type, u64 sig_data); +int force_sig_seccomp(int syscall, int reason, bool force_coredump); int force_sig_ptrace_errno_trap(int errno, void __user *addr); int force_sig_fault_trapno(int sig, int code, void __user *addr, int trapno); int send_sig_fault_trapno(int sig, int code, void __user *addr, int trapno, |