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 /kernel/capability.c | |
| parent | d762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff) | |
| parent | 12a5a2621b1ee14d32beca35304d7c6076a58815 (diff) | |
Merge branch 'next' into for-linus
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 | ||