diff options
| author | Borislav Petkov <bp@suse.de> | 2021-06-23 18:42:12 +0300 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-23 18:43:38 +0300 |
| commit | c4cf5f61982e35348f522464010445efcc0aeb60 (patch) | |
| tree | b3e65bfae5786e33ac82b30d6801983b10934a2f /include/linux/sched | |
| parent | b7c11876d24bdd7ae3feeaa771b8f903f6cf05eb (diff) | |
| parent | f9dfb5e390fab2df9f7944bb91e7705aba14cd26 (diff) | |
| download | linux-c4cf5f61982e35348f522464010445efcc0aeb60.tar.xz | |
Merge x86/urgent into x86/fpu
Pick up dependent changes which either went mainline (x86/urgent is
based on -rc7 and that contains them) as urgent fixes and the current
x86/urgent branch which contains two more urgent fixes, so that the
bigger FPU rework can base off ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux/sched')
| -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 ae60f838ebb9..0d7fec79d28f 100644 --- a/include/linux/sched/signal.h +++ b/include/linux/sched/signal.h @@ -326,6 +326,7 @@ int send_sig_mceerr(int code, void __user *, short, struct task_struct *); 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_ptrace_errno_trap(int errno, void __user *addr); |