aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHirokazu Takata <takata@linux-m32r.org>2005-03-30 16:34:28 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 16:34:28 -0800
commitc718706f56cc2e202893de82fb2157d4fedbd5d9 (patch)
tree4fda0a86eb221fdde94232a956beb9d5fb2a93ad
parent7b502b56175499c472103e1d99346d3b5de7d53f (diff)
downloadhistory-c718706f56cc2e202893de82fb2157d4fedbd5d9.tar.gz
[PATCH] m32r: Fix spinlock.h for CONFIG_DEBUG_SPINLOCK
This patch is for fixing a build error of asm-m32r/spinlock.h for CONFIG_DEBUG_SPINLOCK. Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-m32r/spinlock.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-m32r/spinlock.h b/include/asm-m32r/spinlock.h
index ecf80b74d2c112..6608d8371c5084 100644
--- a/include/asm-m32r/spinlock.h
+++ b/include/asm-m32r/spinlock.h
@@ -102,10 +102,8 @@ static inline void _raw_spin_lock(spinlock_t *lock)
unsigned long tmp0, tmp1;
#ifdef CONFIG_DEBUG_SPINLOCK
- __label__ here;
-here:
- if (lock->magic != SPINLOCK_MAGIC) {
- printk("pc: %p\n", &&here);
+ if (unlikely(lock->magic != SPINLOCK_MAGIC)) {
+ printk("pc: %p\n", __builtin_return_address(0));
BUG();
}
#endif