Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e1e5196 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Ingo Molnar
Browse files

locking/qrwlock: Rename ->lock to ->wait_lock 



... trivial, but reads a little nicer when we name our
actual primitive 'lock'.

Signed-off-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Waiman Long <Waiman.Long@hpe.com>
Link: http://lkml.kernel.org/r/1442216244-4409-1-git-send-email-dave@stgolabs.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e58cdf58

include/asm-generic/qrwlock_types.h

+2 −2
Original line number Diff line number Diff line
@@ -10,12 +10,12 @@ 


typedef struct qrwlock {

	atomic_t		cnts;

	arch_spinlock_t		lock;

	arch_spinlock_t		wait_lock;

} arch_rwlock_t;



#define	__ARCH_RW_LOCK_UNLOCKED {		\

	.cnts = ATOMIC_INIT(0),			\

	.lock = __ARCH_SPIN_LOCK_UNLOCKED,	\

	.wait_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\

}



#endif /* __ASM_GENERIC_QRWLOCK_TYPES_H */

kernel/locking/qrwlock.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts) 
	/*

	 * Put the reader into the wait queue

	 */

	arch_spin_lock(&lock->lock);

	arch_spin_lock(&lock->wait_lock);



	/*

	 * The ACQUIRE semantics of the following spinning code ensure
@@ -99,7 +99,7 @@ void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts) 
	/*

	 * Signal the next one in queue to become queue head

	 */

	arch_spin_unlock(&lock->lock);

	arch_spin_unlock(&lock->wait_lock);

}

EXPORT_SYMBOL(queued_read_lock_slowpath);
@@ -112,7 +112,7 @@ void queued_write_lock_slowpath(struct qrwlock *lock) 
	u32 cnts;



	/* Put the writer into the wait queue */

	arch_spin_lock(&lock->lock);

	arch_spin_lock(&lock->wait_lock);



	/* Try to acquire the lock directly if no reader is present */

	if (!atomic_read(&lock->cnts) &&
@@ -144,6 +144,6 @@ void queued_write_lock_slowpath(struct qrwlock *lock) 
		cpu_relax_lowlatency();

	}

unlock:

	arch_spin_unlock(&lock->lock);

	arch_spin_unlock(&lock->wait_lock);

}

EXPORT_SYMBOL(queued_write_lock_slowpath);