diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 11:42:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-03 11:42:23 +1000 |
| commit | f90e39dcee644480e80263fd3f5912ae4a7a51a3 (patch) | |
| tree | b64e59aa2f34356a5d88fab2264ef30c200b35cf /include/uapi | |
| parent | 1ac268b1c8c1073cb374f1aa382fdcdd3197047a (diff) | |
| parent | 07f081fb5057b2ea98baeca3a47bf0eb33e94aa1 (diff) | |
Merge remote-tracking branch 'security/next'
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/ptrace.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h index cf1019e15f5b..a7a697986614 100644 --- a/include/uapi/linux/ptrace.h +++ b/include/uapi/linux/ptrace.h @@ -89,9 +89,11 @@ struct ptrace_peeksiginfo_args { #define PTRACE_O_TRACESECCOMP (1 << PTRACE_EVENT_SECCOMP) /* eventless options */ -#define PTRACE_O_EXITKILL (1 << 20) +#define PTRACE_O_EXITKILL (1 << 20) +#define PTRACE_O_SUSPEND_SECCOMP (1 << 21) -#define PTRACE_O_MASK (0x000000ff | PTRACE_O_EXITKILL) +#define PTRACE_O_MASK (\ + 0x000000ff | PTRACE_O_EXITKILL | PTRACE_O_SUSPEND_SECCOMP) #include <asm/ptrace.h> |