From b10e5503d819c204f11b677803227433f132f8bd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 31 Mar 2012 11:12:57 -0700 Subject: [PATCH] --- yaml --- r: 298235 b: refs/heads/master c: cdb0f9a1ad2ee3c11e21bc99f0c2021a02844666 h: refs/heads/master i: 298233: ad30275663f34cd189ddda4eeb9a58e38978b7ae 298231: 33b807a11b9a199fe426f6afd1afe097e42d4c9b v: v3 --- [refs] | 2 +- trunk/security/selinux/avc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b54e4cb19934..bdea6672248e 100644 --- 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 index 07620bc94e2a..1a70fa26da72 100644 --- 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)