---

yaml --- r: 298235 b: refs/heads/master c: cdb0f9a h: refs/heads/master i: 298233: ad30275 298231: 33b807a v: v3
git-mirror · Mar 31, 2012 · b10e550 · b10e550
1 parent 42067b1
commit b10e550
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a554bea89948dfb6d2f9c4c62ce2b12b2dac18ad
+refs/heads/master: cdb0f9a1ad2ee3c11e21bc99f0c2021a02844666
diff --git a/trunk/security/selinux/avc.c b/trunk/security/selinux/avc.c
@@ -513,7 +513,7 @@ static noinline int slow_avc_audit(u32 ssid, u32 tsid, u16 tclass,
  * be performed under a lock, to allow the lock to be released
  * before calling the auditing code.
  */
-int avc_audit(u32 ssid, u32 tsid,
+inline int avc_audit(u32 ssid, u32 tsid,
 	       u16 tclass, u32 requested,
 	       struct av_decision *avd, int result, struct common_audit_data *a,
 	       unsigned flags)
@@ -796,7 +796,7 @@ static noinline int avc_denied(u32 ssid, u32 tsid,
  * auditing, e.g. in cases where a lock must be held for the check but
  * should be released for the auditing.
  */
-int avc_has_perm_noaudit(u32 ssid, u32 tsid,
+inline int avc_has_perm_noaudit(u32 ssid, u32 tsid,
 			 u16 tclass, u32 requested,
 			 unsigned flags,
 			 struct av_decision *avd)