diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/sh/kernel/irq.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/sh/kernel/irq.c')
| -rw-r--r-- | arch/sh/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 64b7690c664c..3f1372eb0091 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
| @@ -51,7 +51,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 51 | goto unlock; | 51 | goto unlock; |
| 52 | seq_printf(p, "%3d: ",i); | 52 | seq_printf(p, "%3d: ",i); |
| 53 | for_each_online_cpu(j) | 53 | for_each_online_cpu(j) |
| 54 | seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]); | 54 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); |
| 55 | seq_printf(p, " %14s", irq_desc[i].chip->name); | 55 | seq_printf(p, " %14s", irq_desc[i].chip->name); |
| 56 | seq_printf(p, "-%-8s", irq_desc[i].name); | 56 | seq_printf(p, "-%-8s", irq_desc[i].name); |
| 57 | seq_printf(p, " %s", action->name); | 57 | seq_printf(p, " %s", action->name); |
| @@ -106,7 +106,7 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs) | |||
| 106 | } | 106 | } |
| 107 | #endif | 107 | #endif |
| 108 | 108 | ||
| 109 | irq = irq_demux(evt2irq(irq)); | 109 | irq = irq_demux(intc_evt2irq(irq)); |
| 110 | 110 | ||
| 111 | #ifdef CONFIG_IRQSTACKS | 111 | #ifdef CONFIG_IRQSTACKS |
| 112 | curctx = (union irq_ctx *)current_thread_info(); | 112 | curctx = (union irq_ctx *)current_thread_info(); |