diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-12-08 18:16:41 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-12-15 01:55:32 +0300 |
| commit | 5f6384c5fb6bfc9aac506e058974d3ba293951b3 (patch) | |
| tree | 516b305d715f0c827c3764b9a4e8fc15145a8d25 /arch/alpha/kernel/core_t2.c | |
| parent | c2f21ce2e31286a0a32f8da0a7856e9ca1122ef3 (diff) | |
| download | linux-5f6384c5fb6bfc9aac506e058974d3ba293951b3.tar.xz | |
alpha: Fix fallout from locking changes
spin_* functions are mostly static inline now. That causes the alpha
compile to fail:
CC arch/alpha/kernel/sys_sable.o
cc1: warnings being treated as errors
In file included from arch/alpha/kernel/sys_sable.c:25:
arch/alpha/include/asm/core_t2.h: In function 't2_readb':
arch/alpha/include/asm/core_t2.h:451: error: 'spinlock_check' is static but \
used in inline function 't2_readb' which is not static
arch/alpha/include/asm/core_t2.h:456: error: 'spin_unlock_irqrestore' is \
static but used in inline function 't2_readb' which is not static
That's caused by the "extern inline" magic which is used for the
subarch specific read/write[bwl] functions. I tried to distangle the
uncountable macro onion layers, but failed miserably.
Last resort solution: switch the t2_hae_lock to raw_spinlock_t so the
lock functions are pure macros and function calls again.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Richard Henderson <rth@twiddle.net>
Cc: linux-alpha@vger.kernel.org
Diffstat (limited to 'arch/alpha/kernel/core_t2.c')
| -rw-r--r-- | arch/alpha/kernel/core_t2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/core_t2.c b/arch/alpha/kernel/core_t2.c index d9980d47ab81..e6d90568b65d 100644 --- a/arch/alpha/kernel/core_t2.c +++ b/arch/alpha/kernel/core_t2.c @@ -74,7 +74,7 @@ # define DBG(args) #endif -DEFINE_SPINLOCK(t2_hae_lock); +DEFINE_RAW_SPINLOCK(t2_hae_lock); static volatile unsigned int t2_mcheck_any_expected; static volatile unsigned int t2_mcheck_last_taken; |