diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/capability.h | 3 | ||||
-rw-r--r-- | include/linux/init_task.h | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/capability.h b/include/linux/capability.h index 8d0da30dad2..04fed72809d 100644 --- a/include/linux/capability.h +++ b/include/linux/capability.h | |||
@@ -421,9 +421,6 @@ extern const kernel_cap_t __cap_init_eff_set; | |||
421 | 421 | ||
422 | #endif /* _KERNEL_CAPABILITY_U32S != 2 */ | 422 | #endif /* _KERNEL_CAPABILITY_U32S != 2 */ |
423 | 423 | ||
424 | #define CAP_INIT_INH_SET CAP_EMPTY_SET | ||
425 | #define CAP_INIT_EFF_SET CAP_FULL_SET | ||
426 | |||
427 | # define cap_clear(c) do { (c) = __cap_empty_set; } while (0) | 424 | # define cap_clear(c) do { (c) = __cap_empty_set; } while (0) |
428 | 425 | ||
429 | #define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag)) | 426 | #define cap_raise(c, flag) ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag)) |
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index caa151fbebb..1f277204de3 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, |