Merge tag 'v3.8-rc5' into x86/mm

[~andy/linux] / include / uapi / linux / ptrace.h

diff --git a/include/uapi/linux/ptrace.h b/include/uapi/linux/ptrace.h
index 1ef6c056a9e435640aa7c25ec4a72f2ed4af0c2e..022ab186a81252ceaad11708b69a8fcd964f19ed 100644 (file)
--- a/include/uapi/linux/ptrace.h
+++ b/include/uapi/linux/ptrace.h
@@ -73,7 +73,10 @@
 #define PTRACE_O_TRACEEXIT     (1 << PTRACE_EVENT_EXIT)
 #define PTRACE_O_TRACESECCOMP  (1 << PTRACE_EVENT_SECCOMP)
 
-#define PTRACE_O_MASK          0x000000ff
+/* eventless options */
+#define PTRACE_O_EXITKILL      (1 << 20)
+
+#define PTRACE_O_MASK          (0x000000ff | PTRACE_O_EXITKILL)
 
 #include <asm/ptrace.h>