---

yaml --- r: 285025 b: refs/heads/master c: 6063c04 h: refs/heads/master i: 285023: f797c2f v: v3
git-mirror · Jan 5, 2012 · 329bee6 · 329bee6
1 parent 21e2f09
commit 329bee6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c884c1d4ac955987e84acf2d36c0f160536aca4
+refs/heads/master: 6063c0461b947c26a77674f33a3409eb99e15d2f
diff --git a/trunk/security/selinux/include/security.h b/trunk/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/trunk/security/selinux/selinuxfs.c b/trunk/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)