git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
sh
/
kernel
/
cpu
/
irq
/
imask.c
diff --git
a/arch/sh/kernel/cpu/irq/imask.c
b/arch/sh/kernel/cpu/irq/imask.c
index
a33ae3e
..
301b505
100644
(file)
--- a/
arch/sh/kernel/cpu/irq/imask.c
+++ b/
arch/sh/kernel/cpu/irq/imask.c
@@
-53,7
+53,10
@@
void static inline set_interrupt_registers(int ip)
{
unsigned long __dummy;
- asm volatile("ldc %2, r6_bank\n\t"
+ asm volatile(
+#ifdef CONFIG_CPU_HAS_SR_RB
+ "ldc %2, r6_bank\n\t"
+#endif
"stc sr, %0\n\t"
"and #0xf0, %0\n\t"
"shlr2 %0\n\t"