git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
irq.c
diff --git
a/arch/m32r/kernel/irq.c
b/arch/m32r/kernel/irq.c
index
7db26f1
..
76eaf38
100644
(file)
--- a/
arch/m32r/kernel/irq.c
+++ b/
arch/m32r/kernel/irq.c
@@
-40,8
+40,10
@@
int show_interrupts(struct seq_file *p, void *v)
}
if (i < NR_IRQS) {
}
if (i < NR_IRQS) {
- raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
- action = irq_desc[i].action;
+ struct irq_desc *desc = irq_to_desc(i);
+
+ raw_spin_lock_irqsave(&desc->lock, flags);
+ action = desc->action;
if (!action)
goto skip;
seq_printf(p, "%3d: ",i);
if (!action)
goto skip;
seq_printf(p, "%3d: ",i);
@@
-51,7
+53,7
@@
int show_interrupts(struct seq_file *p, void *v)
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
for_each_online_cpu(j)
seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
#endif
- seq_printf(p, " %14s",
irq_desc[i]
.chip->name);
+ seq_printf(p, " %14s",
desc->irq_data
.chip->name);
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
seq_printf(p, " %s", action->name);
for (action=action->next; action; action = action->next)
@@
-59,7
+61,7
@@
int show_interrupts(struct seq_file *p, void *v)
seq_putc(p, '\n');
skip:
seq_putc(p, '\n');
skip:
- raw_spin_unlock_irqrestore(&
irq_desc[i].
lock, flags);
+ raw_spin_unlock_irqrestore(&
desc->
lock, flags);
}
return 0;
}
}
return 0;
}
@@
-78,7
+80,7
@@
asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */
#endif
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */
#endif
-
__do_IRQ
(irq);
+
generic_handle_irq
(irq);
irq_exit();
set_irq_regs(old_regs);
irq_exit();
set_irq_regs(old_regs);