diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-06-11 20:11:29 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-06-11 20:11:29 +0200 |
| commit | 924412f66fd9d21212e560a93792b0b607d46c6e (patch) | |
| tree | 823ac1d1f21062c6ad45d52f7bb5ad0a475dd123 /include/linux/prctl.h | |
| parent | e40468a54882ef7411fb178dbf2e465ec2349af7 (diff) | |
| parent | 84bf1bccc60cc64376125ea2eae05e4ba12f795b (diff) | |
| download | linux-next-924412f66fd9d21212e560a93792b0b607d46c6e.tar.gz | |
Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks into timers/core
Diffstat (limited to 'include/linux/prctl.h')
| -rw-r--r-- | include/linux/prctl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/prctl.h b/include/linux/prctl.h index 711e0a30aacc..3988012255dc 100644 --- a/include/linux/prctl.h +++ b/include/linux/prctl.h @@ -127,8 +127,8 @@ #define PR_SET_PTRACER 0x59616d61 # define PR_SET_PTRACER_ANY ((unsigned long)-1) -#define PR_SET_CHILD_SUBREAPER 36 -#define PR_GET_CHILD_SUBREAPER 37 +#define PR_SET_CHILD_SUBREAPER 36 +#define PR_GET_CHILD_SUBREAPER 37 /* * If no_new_privs is set, then operations that grant new privileges (i.e. @@ -142,7 +142,9 @@ * asking selinux for a specific new context (e.g. with runcon) will result * in execve returning -EPERM. */ -#define PR_SET_NO_NEW_PRIVS 38 -#define PR_GET_NO_NEW_PRIVS 39 +#define PR_SET_NO_NEW_PRIVS 38 +#define PR_GET_NO_NEW_PRIVS 39 + +#define PR_GET_TID_ADDRESS 40 #endif /* _LINUX_PRCTL_H */ |