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 /kernel/capability.c | |
| 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 'kernel/capability.c')
| -rw-r--r-- | kernel/capability.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/capability.c b/kernel/capability.c index 32a80e08ff4b..283c529f8b1c 100644 --- a/kernel/capability.c +++ b/kernel/capability.c | |||
| @@ -22,12 +22,8 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; | 24 | const kernel_cap_t __cap_empty_set = CAP_EMPTY_SET; |
| 25 | const kernel_cap_t __cap_full_set = CAP_FULL_SET; | ||
| 26 | const kernel_cap_t __cap_init_eff_set = CAP_INIT_EFF_SET; | ||
| 27 | 25 | ||
| 28 | EXPORT_SYMBOL(__cap_empty_set); | 26 | EXPORT_SYMBOL(__cap_empty_set); |
| 29 | EXPORT_SYMBOL(__cap_full_set); | ||
| 30 | EXPORT_SYMBOL(__cap_init_eff_set); | ||
| 31 | 27 | ||
| 32 | int file_caps_enabled = 1; | 28 | int file_caps_enabled = 1; |
| 33 | 29 | ||