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

Commit 1acf93ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking build fix from Thomas Gleixner:
 "A single fix for a build fail with CONFIG_PROFILE_ALL_BRANCHES=y in
  the qspinlock code"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/qspinlock: Fix compile error
parents 0b002cdd b987ffc1

arch/x86/include/asm/qspinlock.h

+8 −5
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ 
#define queued_fetch_set_pending_acquire queued_fetch_set_pending_acquire

static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lock)

{

	u32 val = 0;



	if (GEN_BINARY_RMWcc(LOCK_PREFIX "btsl", lock->val.counter, c,

			     "I", _Q_PENDING_OFFSET))

		val |= _Q_PENDING_VAL;

	u32 val;



	/*

	 * We can't use GEN_BINARY_RMWcc() inside an if() stmt because asm goto

	 * and CONFIG_PROFILE_ALL_BRANCHES=y results in a label inside a

	 * statement expression, which GCC doesn't like.

	 */

	val = GEN_BINARY_RMWcc(LOCK_PREFIX "btsl", lock->val.counter, c,

			       "I", _Q_PENDING_OFFSET) * _Q_PENDING_VAL;

	val |= atomic_read(&lock->val) & ~_Q_PENDING_MASK;



	return val;