diff options
| author | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
|---|---|---|
| committer | Joel Becker <jlbec@evilplan.org> | 2011-05-26 00:51:55 -0400 |
| commit | ece928df16494becd43f999aff9bd530182e7e81 (patch) | |
| tree | 905042764ea5d8ab6eda63666406e19f607bcf4c /include/linux/init_task.h | |
| parent | 3d1c1829ebe7e8bb48a997b39b4865abc9197e5e (diff) | |
| parent | dda54e76d7dba0532ebdd72e0b4f492a03f83225 (diff) | |
Merge branch 'move_extents' of git://oss.oracle.com/git/tye/linux-2.6 into ocfs2-merge-window
Conflicts:
fs/ocfs2/ioctl.c
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, |