diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-10-03 19:25:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-10 11:50:17 +0200 |
| commit | 26c4eb192c6224e5297496cead36404b62fb071b (patch) | |
| tree | df7303338d50849ac975d9fc1e808a900a22fcc9 /security/apparmor/include | |
| parent | 0dc208b5d5feedc795cbf124539decd182c8e99e (diff) | |
| download | op-kernel-dev-26c4eb192c6224e5297496cead36404b62fb071b.zip op-kernel-dev-26c4eb192c6224e5297496cead36404b62fb071b.tar.gz | |
locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() with lockdep
The lockdep subsystem provides a robust way to assert that a lock is
held, so use that instead of write_can_lock, which can give incorrect
results for qrwlocks.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: John Johansen <john.johansen@canonical.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: paulmck@linux.vnet.ibm.com
Link: http://lkml.kernel.org/r/1507055129-12300-1-git-send-email-will.deacon@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/apparmor/include')
| -rw-r--r-- | security/apparmor/include/lib.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index 436b3a7..f546707 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h @@ -19,17 +19,6 @@ #include "match.h" -/* Provide our own test for whether a write lock is held for asserts - * this is because on none SMP systems write_can_lock will always - * resolve to true, which is what you want for code making decisions - * based on it, but wrong for asserts checking that the lock is held - */ -#ifdef CONFIG_SMP -#define write_is_locked(X) !write_can_lock(X) -#else -#define write_is_locked(X) (1) -#endif /* CONFIG_SMP */ - /* * DEBUG remains global (no per profile flag) since it is mostly used in sysctl * which is not related to profile accesses. |
