aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2011-08-17 11:17:14 +1000
committerJames Morris <jmorris@namei.org>2011-09-09 16:56:26 -0700
commit58982b74832917405a483a22beede729e3175376 (patch)
treefc6fa24b9cf15490de54501125ac08049abb5ea0
parentselinux: sparse fix: move selinux_complete_init (diff)
downloadlinux-dev-58982b74832917405a483a22beede729e3175376.tar.xz
linux-dev-58982b74832917405a483a22beede729e3175376.zip
selinux: sparse fix: declare selinux_disable() in security.h
Sparse fix: declare selinux_disable() in security.h Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r--security/selinux/include/security.h1
-rw-r--r--security/selinux/selinuxfs.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/include/security.h b/security/selinux/include/security.h
index 8556e1a263c2..30002c43436f 100644
--- a/security/selinux/include/security.h
+++ b/security/selinux/include/security.h
@@ -217,6 +217,7 @@ struct selinux_kernel_status {
extern void selinux_status_update_setenforce(int enforcing);
extern void selinux_status_update_policyload(int seqno);
extern void selinux_complete_init(void);
+extern int selinux_disable(void);
#endif /* _SELINUX_SECURITY_H_ */
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 55d92cbb177a..d3677c6c12c6 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -278,7 +278,6 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
char *page = NULL;
ssize_t length;
int new_value;
- extern int selinux_disable(void);
length = -ENOMEM;
if (count >= PAGE_SIZE)