From 6a978663564d0fe0f7dc7684798807e531b24b2c Mon Sep 17 00:00:00 2001 From: James Morris Date: Wed, 17 Aug 2011 11:13:31 +1000 Subject: [PATCH] --- yaml --- r: 264519 b: refs/heads/master c: cc59a582d6081b296e481b8bc9676b5c2faad818 h: refs/heads/master i: 264517: 0c17de154c0474a6abf14856e760d9dd39ff850b 264515: 538b08ee1220785d3cc8275d65217902dffba39d 264511: 05e3124e5cd2ab83048e3e8899143cdfb4d9d58a v: v3 --- [refs] | 2 +- trunk/security/selinux/include/security.h | 1 + trunk/security/selinux/ss/services.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1ac9097cdea..bb3a3bc058c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56a4ca996181b94b30e6b46509dc28e4ca3cc3f8 +refs/heads/master: cc59a582d6081b296e481b8bc9676b5c2faad818 diff --git a/trunk/security/selinux/include/security.h b/trunk/security/selinux/include/security.h index 3ba4feba048a..8556e1a263c2 100644 --- a/trunk/security/selinux/include/security.h +++ b/trunk/security/selinux/include/security.h @@ -216,6 +216,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); #endif /* _SELINUX_SECURITY_H_ */ diff --git a/trunk/security/selinux/ss/services.c b/trunk/security/selinux/ss/services.c index f6917bc0aa05..37c50c602f17 100644 --- a/trunk/security/selinux/ss/services.c +++ b/trunk/security/selinux/ss/services.c @@ -1790,7 +1790,6 @@ static void security_load_policycaps(void) POLICYDB_CAPABILITY_OPENPERM); } -extern void selinux_complete_init(void); static int security_preserve_bools(struct policydb *p); /**