Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-5
+8
-5
arch/x86/include/asm/qspinlock.h
+8
-5
arch/x86/include/asm/qspinlock.h
···
13
13
#define queued_fetch_set_pending_acquire queued_fetch_set_pending_acquire
14
14
static __always_inline u32 queued_fetch_set_pending_acquire(struct qspinlock *lock)
15
15
{
16
-
u32 val = 0;
16
+
u32 val;
17
17
18
-
if (GEN_BINARY_RMWcc(LOCK_PREFIX "btsl", lock->val.counter, c,
19
-
"I", _Q_PENDING_OFFSET))
20
-
val |= _Q_PENDING_VAL;
21
-
18
+
/*
19
+
* We can't use GEN_BINARY_RMWcc() inside an if() stmt because asm goto
20
+
* and CONFIG_PROFILE_ALL_BRANCHES=y results in a label inside a
21
+
* statement expression, which GCC doesn't like.
22
+
*/
23
+
val = GEN_BINARY_RMWcc(LOCK_PREFIX "btsl", lock->val.counter, c,
24
+
"I", _Q_PENDING_OFFSET) * _Q_PENDING_VAL;
22
25
val |= atomic_read(&lock->val) & ~_Q_PENDING_MASK;
23
26
24
27
return val;