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
fedora core 6 1.2949 + vserver 2.2.0
[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
baed9a5
..
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;
{
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"
"stc sr, %0\n\t"
"and #0xf0, %0\n\t"
"shlr2 %0\n\t"
@@
-105,6
+108,6
@@
static void shutdown_imask_irq(unsigned int irq)
void make_imask_irq(unsigned int irq)
{
disable_irq_nosync(irq);
void make_imask_irq(unsigned int irq)
{
disable_irq_nosync(irq);
- irq_desc[irq].
handler
= &imask_irq_type;
+ irq_desc[irq].
chip
= &imask_irq_type;
enable_irq(irq);
}
enable_irq(irq);
}