Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[safe/jmp/linux-2.6] / include / linux / prctl.h

diff --git a/include/linux/prctl.h b/include/linux/prctl.h
index 48d887e..9311505 100644 (file)
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@ -85,4 +85,9 @@
 #define PR_SET_TIMERSLACK 29
 #define PR_GET_TIMERSLACK 30
 
+#define PR_TASK_PERF_EVENTS_DISABLE            31
+#define PR_TASK_PERF_EVENTS_ENABLE             32
+
+#define PR_MCE_KILL    33
+
 #endif /* _LINUX_PRCTL_H */