diff options
| author | Christoph Hellwig <hch@lst.de> | 2004-10-18 18:13:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-10-18 18:13:09 -0700 |
| commit | e979196eec1ff90b88e1476d43f20199be061fd8 (patch) | |
| tree | f757c6aacad63184212a5d220913044900363f3a /include/linux/security.h | |
| parent | 838eb75e8b4be018d932d37eaee8c84db7f2179e (diff) | |
[PATCH] don't include <linux/sysctl.h> in <linux/security.h>
security.h gets pulled in in lots of places, so use forward declarations
for struct ctl_table instead of pulling sysctl in everywhere.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index a1dee9a60587..e6e33efab64c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -27,13 +27,14 @@ #include <linux/signal.h> #include <linux/resource.h> #include <linux/sem.h> -#include <linux/sysctl.h> #include <linux/shm.h> #include <linux/msg.h> #include <linux/sched.h> #include <linux/skbuff.h> #include <linux/netlink.h> +struct ctl_table; + /* * These functions are in security/capability.c and are used * as the default capabilities functions @@ -1029,7 +1030,7 @@ struct security_operations { kernel_cap_t * inheritable, kernel_cap_t * permitted); int (*acct) (struct file * file); - int (*sysctl) (ctl_table * table, int op); + int (*sysctl) (struct ctl_table * table, int op); int (*capable) (struct task_struct * tsk, int cap); int (*quotactl) (int cmds, int type, int id, struct super_block * sb); int (*quota_on) (struct file * f); @@ -1268,7 +1269,7 @@ static inline int security_acct (struct file *file) return security_ops->acct (file); } -static inline int security_sysctl(ctl_table * table, int op) +static inline int security_sysctl(struct ctl_table *table, int op) { return security_ops->sysctl(table, op); } @@ -1940,7 +1941,7 @@ static inline int security_acct (struct file *file) return 0; } -static inline int security_sysctl(ctl_table * table, int op) +static inline int security_sysctl(struct ctl_table *table, int op) { return 0; } |