From: Eric W. Biederman <ebiederm@xmission.com>
Date: Fri, 27 Aug 2021 03:54:15 +0000 (-0500)
Subject: Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a3be01837fc9f2c0f9f7356adec7222c0e199af8;p=users%2Fjedix%2Flinux-maple.git

Merge of ucount-fixes-for-5.14, siginfo-si_trapno-for-v5.15, and exit-cleanups-for-v5.15 for testing in linux-next
---

a3be01837fc9f2c0f9f7356adec7222c0e199af8
diff --cc include/linux/sched/signal.h
index b9126fe06c3fc,928e0025d3580,e3c933facd868..f3a108f625f93
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@@@ -328,7 -320,10 -328,8 +320,11 @@@@ int force_sig_bnderr(void __user *addr
   int force_sig_pkuerr(void __user *addr, u32 pkey);
   int force_sig_perf(void __user *addr, u32 type, u64 sig_data);
   
  -int force_sig_ptrace_errno_trap(int errno, void __user *addr);
++ 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,
+ +			struct task_struct *t);
   
   extern int send_sig_info(int, struct kernel_siginfo *, struct task_struct *);
   extern void force_sigsegv(int sig);