aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/capability.c6
-rw-r--r--security/security.c5
2 files changed, 0 insertions, 11 deletions
diff --git a/security/capability.c b/security/capability.c
index 383d14dc12ef..85b67c8632df 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -12,11 +12,6 @@
12 12
13#include <linux/security.h> 13#include <linux/security.h>
14 14
15static int cap_sysctl(ctl_table *table, int op)
16{
17 return 0;
18}
19
20static int cap_syslog(int type) 15static int cap_syslog(int type)
21{ 16{
22 return 0; 17 return 0;
@@ -881,7 +876,6 @@ void __init security_fixup_ops(struct security_operations *ops)
881 set_to_cap_if_null(ops, capable); 876 set_to_cap_if_null(ops, capable);
882 set_to_cap_if_null(ops, quotactl); 877 set_to_cap_if_null(ops, quotactl);
883 set_to_cap_if_null(ops, quota_on); 878 set_to_cap_if_null(ops, quota_on);
884 set_to_cap_if_null(ops, sysctl);
885 set_to_cap_if_null(ops, syslog); 879 set_to_cap_if_null(ops, syslog);
886 set_to_cap_if_null(ops, settime); 880 set_to_cap_if_null(ops, settime);
887 set_to_cap_if_null(ops, vm_enough_memory); 881 set_to_cap_if_null(ops, vm_enough_memory);
diff --git a/security/security.c b/security/security.c
index 4830f36e1ab5..8f28685ee0d9 100644
--- a/security/security.c
+++ b/security/security.c
@@ -182,11 +182,6 @@ int security_real_capable_noaudit(struct task_struct *tsk, int cap)
182 return ret; 182 return ret;
183} 183}
184 184
185int security_sysctl(struct ctl_table *table, int op)
186{
187 return security_ops->sysctl(table, op);
188}
189
190int security_quotactl(int cmds, int type, int id, struct super_block *sb) 185int security_quotactl(int cmds, int type, int id, struct super_block *sb)
191{ 186{
192 return security_ops->quotactl(cmds, type, id, sb); 187 return security_ops->quotactl(cmds, type, id, sb);