diff options
| author | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-24 14:55:24 +0200 |
| commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
| tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /include/linux/init_task.h | |
| parent | Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/let... (diff) | |
| parent | Merge branch 'master' into next (diff) | |
| download | linux-434d42cfd05a7cc452457a81d2029540cba12150.tar.xz linux-434d42cfd05a7cc452457a81d2029540cba12150.zip | |
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 689496bb6654..bafc58c00fc3 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, |