2005-03-30 01:00:42

by Hirokazu Takata

[permalink] [raw]
Subject: [PATCH 2.6.12-rc1] 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.
Please apply.

Thanks,

Signed-off-by: Hirokazu Takata <[email protected]>
---

include/asm-m32r/spinlock.h | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)

diff -ruNp a/include/asm-m32r/spinlock.h b/include/asm-m32r/spinlock.h
--- a/include/asm-m32r/spinlock.h 2005-03-07 14:10:57.000000000 +0900
+++ b/include/asm-m32r/spinlock.h 2005-03-08 14:08:57.000000000 +0900
@@ -102,10 +102,8 @@ static inline void _raw_spin_lock(spinlo
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

--
Hirokazu Takata <[email protected]>
Linux/M32R Project: http://www.linux-m32r.org/