diff options
| author | Ingo Molnar | 2006-03-22 09:09:14 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-03-22 16:54:06 +0100 |
| commit | bb0030797f55c9996ea1cebd16b65750ceb7e4fd (patch) | |
| tree | 58256f9840bf05f141d986b6329a08e38065616a /security/selinux/ss/services.c | |
| parent | [PATCH] selinux: Disable automatic labeling of new inodes when no policy is l... (diff) | |
| download | kernel-qcow2-linux-bb0030797f55c9996ea1cebd16b65750ceb7e4fd.tar.gz kernel-qcow2-linux-bb0030797f55c9996ea1cebd16b65750ceb7e4fd.tar.xz kernel-qcow2-linux-bb0030797f55c9996ea1cebd16b65750ceb7e4fd.zip | |
[PATCH] sem2mutex: security/
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Smalley <sds@epoch.ncsc.mil>
Cc: James Morris <jmorris@namei.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/selinux/ss/services.c')
| -rw-r--r-- | security/selinux/ss/services.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 8a764928ff4b..63e0b7f29cb5 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -27,7 +27,8 @@ #include <linux/in.h> #include <linux/sched.h> #include <linux/audit.h> -#include <asm/semaphore.h> +#include <linux/mutex.h> + #include "flask.h" #include "avc.h" #include "avc_ss.h" @@ -48,9 +49,9 @@ static DEFINE_RWLOCK(policy_rwlock); #define POLICY_RDUNLOCK read_unlock(&policy_rwlock) #define POLICY_WRUNLOCK write_unlock_irq(&policy_rwlock) -static DECLARE_MUTEX(load_sem); -#define LOAD_LOCK down(&load_sem) -#define LOAD_UNLOCK up(&load_sem) +static DEFINE_MUTEX(load_mutex); +#define LOAD_LOCK mutex_lock(&load_mutex) +#define LOAD_UNLOCK mutex_unlock(&load_mutex) static struct sidtab sidtab; struct policydb policydb; |