aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-17 08:39:19 -0400
committerThomas Gleixner <tglx@linutronix.de>2011-03-17 10:52:25 -0400
commit15825a5cd4adb199fd76737e8bc846154e315218 (patch)
tree3c42f7eb5eef109f7de3f61ee620fa1ae0f0839a
parentee0401ec11bb7b83b7fa9476d0aaeabd59216062 (diff)
cris: Use generic show_interrupts()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
-rw-r--r--arch/cris/Kconfig1
-rw-r--r--arch/cris/kernel/irq.c39
2 files changed, 1 insertions, 39 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 0a7a4c11d8b1..4db5b46e1eff 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -56,6 +56,7 @@ config CRIS
56 select HAVE_IDE 56 select HAVE_IDE
57 select HAVE_GENERIC_HARDIRQS 57 select HAVE_GENERIC_HARDIRQS
58 select GENERIC_HARDIRQS_NO_DEPRECATED 58 select GENERIC_HARDIRQS_NO_DEPRECATED
59 select GENERIC_IRQ_SHOW
59 60
60config HZ 61config HZ
61 int 62 int
diff --git a/arch/cris/kernel/irq.c b/arch/cris/kernel/irq.c
index c346952f06dc..788eb2248916 100644
--- a/arch/cris/kernel/irq.c
+++ b/arch/cris/kernel/irq.c
@@ -37,45 +37,6 @@
37 37
38#include <asm/io.h> 38#include <asm/io.h>
39 39
40int show_interrupts(struct seq_file *p, void *v)
41{
42 int i = *(loff_t *) v, j;
43 struct irqaction * action;
44 unsigned long flags;
45
46 if (i == 0) {
47 seq_printf(p, " ");
48 for_each_online_cpu(j)
49 seq_printf(p, "CPU%d ",j);
50 seq_putc(p, '\n');
51 }
52
53 if (i < NR_IRQS) {
54 raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
55 action = irq_desc[i].action;
56 if (!action)
57 goto skip;
58 seq_printf(p, "%3d: ",i);
59#ifndef CONFIG_SMP
60 seq_printf(p, "%10u ", kstat_irqs(i));
61#else
62 for_each_online_cpu(j)
63 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
64#endif
65 seq_printf(p, " %14s", irq_desc[i].irq_data.chip->name);
66 seq_printf(p, " %s", action->name);
67
68 for (action=action->next; action; action = action->next)
69 seq_printf(p, ", %s", action->name);
70
71 seq_putc(p, '\n');
72skip:
73 raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
74 }
75 return 0;
76}
77
78
79/* called by the assembler IRQ entry functions defined in irq.h 40/* called by the assembler IRQ entry functions defined in irq.h
80 * to dispatch the interrupts to registered handlers 41 * to dispatch the interrupts to registered handlers
81 * interrupts are disabled upon entry - depending on if the 42 * interrupts are disabled upon entry - depending on if the