diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-14 04:06:02 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-14 04:06:02 +0400 |
| commit | 69539ab1006f6c55cc5243fa82341bb6e59c07ed (patch) | |
| tree | 446ef9e4e3b7758e9ab37c1ae28b06d872cd4bd7 /arch/tile/lib | |
| parent | 0a49aecaf416377b64d0f03907c2412acbb396be (diff) | |
| parent | ad092338350e517608a41341095b6b1e312c4eb1 (diff) | |
| download | linux-69539ab1006f6c55cc5243fa82341bb6e59c07ed.tar.xz | |
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile update from Chris Metcalf
"These include a couple of queued-up minor bug fixes from the
community, a fix to unbreak the sysfs hooks in tile, and syncing up
the defconfigs."
Ugh. defconfigs updates without "make minconfig". Tons of ugly
pointless lines there, I suspect.
* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: Use set_current_blocked() and block_sigmask()
arch/tile: misplaced parens near likely
arch/tile: sync up the defconfig files to the tip
arch/tile: Fix up from commit 8a25a2fd126c621f44f3aeaef80d51f00fc11639
Diffstat (limited to 'arch/tile/lib')
| -rw-r--r-- | arch/tile/lib/spinlock_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/lib/spinlock_32.c b/arch/tile/lib/spinlock_32.c index cb0999fb64b4..b16ac49a968e 100644 --- a/arch/tile/lib/spinlock_32.c +++ b/arch/tile/lib/spinlock_32.c @@ -144,7 +144,7 @@ void arch_read_unlock(arch_rwlock_t *rwlock) for (;;) { __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 1); val = __insn_tns((int *)&rwlock->lock); - if (likely(val & 1) == 0) { + if (likely((val & 1) == 0)) { rwlock->lock = val - (1 << _RD_COUNT_SHIFT); __insn_mtspr(SPR_INTERRUPT_CRITICAL_SECTION, 0); break; |