diff options
author | James Morris <jmorris@namei.org> | 2011-05-24 22:55:24 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-05-24 22:55:24 +1000 |
commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /include/linux/init_task.h | |
parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
parent | 12a5a2621b1ee14d32beca35304d7c6076a58815 (diff) | |
download | op-kernel-dev-434d42cfd05a7cc452457a81d2029540cba12150.zip op-kernel-dev-434d42cfd05a7cc452457a81d2029540cba12150.tar.gz |
Merge branch 'next' into for-linus
Diffstat (limited to 'include/linux/init_task.h')
-rw-r--r-- | include/linux/init_task.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 689496b..bafc58c 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -83,13 +83,6 @@ extern struct group_info init_groups; #define INIT_IDS #endif -/* - * Because of the reduced scope of CAP_SETPCAP when filesystem - * capabilities are in effect, it is safe to allow CAP_SETPCAP to - * be available in the default configuration. - */ -# define CAP_INIT_BSET CAP_FULL_SET - #ifdef CONFIG_RCU_BOOST #define INIT_TASK_RCU_BOOST() \ .rcu_boost_mutex = NULL, |