diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-07-20 03:19:19 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-07-20 03:19:19 -0400 |
| commit | fe6c59dc17908effd4e2caa666795b9ad984005b (patch) | |
| tree | 9c3261a0eef864b7ec7fe52d93e1d1c5c165d901 /include/uapi/linux | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| parent | 221272f97ca528048a577a3ff23d7774286ca5fd (diff) | |
Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next
Diffstat (limited to 'include/uapi/linux')
| -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 { | |||
| 89 | #define PTRACE_O_TRACESECCOMP (1 << PTRACE_EVENT_SECCOMP) | 89 | #define PTRACE_O_TRACESECCOMP (1 << PTRACE_EVENT_SECCOMP) |
| 90 | 90 | ||
| 91 | /* eventless options */ | 91 | /* eventless options */ |
| 92 | #define PTRACE_O_EXITKILL (1 << 20) | 92 | #define PTRACE_O_EXITKILL (1 << 20) |
| 93 | #define PTRACE_O_SUSPEND_SECCOMP (1 << 21) | ||
| 93 | 94 | ||
| 94 | #define PTRACE_O_MASK (0x000000ff | PTRACE_O_EXITKILL) | 95 | #define PTRACE_O_MASK (\ |
| 96 | 0x000000ff | PTRACE_O_EXITKILL | PTRACE_O_SUSPEND_SECCOMP) | ||
| 95 | 97 | ||
| 96 | #include <asm/ptrace.h> | 98 | #include <asm/ptrace.h> |
| 97 | 99 | ||