diff options
| author | James Morris <jmorris@namei.org> | 2011-05-24 08:55:24 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-24 08:55:24 -0400 |
| commit | 434d42cfd05a7cc452457a81d2029540cba12150 (patch) | |
| tree | 3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422 /include/linux/init_task.h | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | 12a5a2621b1ee14d32beca35304d7c6076a58815 (diff) | |
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; | |||
| 83 | #define INIT_IDS | 83 | #define INIT_IDS |
| 84 | #endif | 84 | #endif |
| 85 | 85 | ||
| 86 | /* | ||
| 87 | * Because of the reduced scope of CAP_SETPCAP when filesystem | ||
| 88 | * capabilities are in effect, it is safe to allow CAP_SETPCAP to | ||
| 89 | * be available in the default configuration. | ||
| 90 | */ | ||
| 91 | # define CAP_INIT_BSET CAP_FULL_SET | ||
| 92 | |||
| 93 | #ifdef CONFIG_RCU_BOOST | 86 | #ifdef CONFIG_RCU_BOOST |
| 94 | #define INIT_TASK_RCU_BOOST() \ | 87 | #define INIT_TASK_RCU_BOOST() \ |
| 95 | .rcu_boost_mutex = NULL, | 88 | .rcu_boost_mutex = NULL, |