diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:45:29 +0200 |
commit | b5e4111f027c4be85dbe97e090530d03c55c4cf4 (patch) | |
tree | 11e0a37cb59314f4e9a7b2810124a4a7a33140e5 /kernel/locking/rwsem.c | |
parent | 72d5305dcb3637913c2c37e847a4de9028e49244 (diff) | |
parent | 9de8033f1bbcce5ed23fe5da9ca1a5060207f7ed (diff) |
Merge branch 'locking/urgent' into locking/core, before applying larger changes and to refresh the branch with fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/locking/rwsem.c')
-rw-r--r-- | kernel/locking/rwsem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index 42f806de49d4..e2d3bc7f03b4 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -12,7 +12,7 @@ #include <linux/atomic.h> -#if defined(CONFIG_SMP) && defined(CONFIG_RWSEM_XCHGADD_ALGORITHM) +#ifdef CONFIG_RWSEM_SPIN_ON_OWNER static inline void rwsem_set_owner(struct rw_semaphore *sem) { sem->owner = current; |