History

Merge tag 'seccomp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

James Morris committed 11 years ago

Commit fe6c59d2 parents 52721d9 221272f5 files · +31 −8Browse files

Showing the changes to include/uapi (1 of 5 files). Show all

Unified · Split

include/uapi/linux/ptrace.h+4−2
@@ -89,9 +89,11 @@ struct ptrace_peeksiginfo_args { · 88 unmodified lines
8989 #define PTRACE_O_TRACESECCOMP (1 << PTRACE_EVENT_SECCOMP)
9090
9191 /* eventless options */
92−#define PTRACE_O_EXITKILL (1 << 20)
92+#define PTRACE_O_EXITKILL (1 << 20)
93+#define PTRACE_O_SUSPEND_SECCOMP (1 << 21)
9394
94−#define PTRACE_O_MASK (0x000000ff | PTRACE_O_EXITKILL)
95+#define PTRACE_O_MASK (\
96+ 0x000000ff | PTRACE_O_EXITKILL | PTRACE_O_SUSPEND_SECCOMP)
9597
9698 #include <asm/ptrace.h>
9799

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t