From 21e2f0986ac1771f588000385c74a677ed58c717 Mon Sep 17 00:00:00 2001 From: James Morris Date: Tue, 30 Aug 2011 14:16:24 +1000 Subject: [PATCH] --- yaml --- r: 285024 b: refs/heads/master c: 5c884c1d4ac955987e84acf2d36c0f160536aca4 h: refs/heads/master 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 2d7fecfec111..80b78274a23b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b46610caba4bd9263afd07c7ef7a79974550554a +refs/heads/master: 5c884c1d4ac955987e84acf2d36c0f160536aca4 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); /**