m32r: Use generic show_interrupts()

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

m32r: Use generic show_interrupts()
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner
1 parent 27e5c5a9a2
Showing 2 changed files with 1 additions and 45 deletions Side-by-side Diff
arch/m32r/Kconfig
arch/m32r/kernel/irq.c
@@ -10,6 +10,7 @@
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_HARDIRQS_NO_DEPRECATED
 	select GENERIC_IRQ_PROBE
+	select GENERIC_IRQ_SHOW
  
 config SBUS
 	bool
@@ -18,53 +18,8 @@
  
 #include <linux/kernel_stat.h>
 #include <linux/interrupt.h>
-#include <linux/seq_file.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>
-
-/*
- * Generic, controller-independent functions:
- */
-
-int show_interrupts(struct seq_file *p, void *v)
-{
-	int i = *(loff_t *) v, j;
-	struct irqaction * action;
-	unsigned long flags;
-
-	if (i == 0) {
-		seq_printf(p, "           ");
-		for_each_online_cpu(j)
-			seq_printf(p, "CPU%d       ",j);
-		seq_putc(p, '\n');
-	}
-
-	if (i < NR_IRQS) {
-		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);
-#ifndef CONFIG_SMP
-		seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-		for_each_online_cpu(j)
-			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-#endif
-		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);
-
-		seq_putc(p, '\n');
-skip:
-		raw_spin_unlock_irqrestore(&desc->lock, flags);
-	}
-	return 0;
-}
  
 /*
  * do_IRQ handles all normal device IRQs (the special
...	...	@@ -10,6 +10,7 @@
10	10	select HAVE_GENERIC_HARDIRQS
11	11	select GENERIC_HARDIRQS_NO_DEPRECATED
12	12	select GENERIC_IRQ_PROBE
	13	+ select GENERIC_IRQ_SHOW
13	14
14	15	config SBUS
15	16	bool
...	...	@@ -18,53 +18,8 @@
18	18
19	19	#include <linux/kernel_stat.h>
20	20	#include <linux/interrupt.h>
21		-#include <linux/seq_file.h>
22	21	#include <linux/module.h>
23	22	#include <asm/uaccess.h>
24		-
25		-/*
26		- * Generic, controller-independent functions:
27		- */
28		-
29		-int show_interrupts(struct seq_file p, void v)
30		-{
31		- int i = (loff_t ) v, j;
32		- struct irqaction * action;
33		- unsigned long flags;
34		-
35		- if (i == 0) {
36		- seq_printf(p, " ");
37		- for_each_online_cpu(j)
38		- seq_printf(p, "CPU%d ",j);
39		- seq_putc(p, '\n');
40		- }
41		-
42		- if (i < NR_IRQS) {
43		- struct irq_desc *desc = irq_to_desc(i);
44		-
45		- raw_spin_lock_irqsave(&desc->lock, flags);
46		- action = desc->action;
47		- if (!action)
48		- goto skip;
49		- seq_printf(p, "%3d: ",i);
50		-#ifndef CONFIG_SMP
51		- seq_printf(p, "%10u ", kstat_irqs(i));
52		-#else
53		- for_each_online_cpu(j)
54		- seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
55		-#endif
56		- seq_printf(p, " %14s", desc->irq_data.chip->name);
57		- seq_printf(p, " %s", action->name);
58		-
59		- for (action=action->next; action; action = action->next)
60		- seq_printf(p, ", %s", action->name);
61		-
62		- seq_putc(p, '\n');
63		-skip:
64		- raw_spin_unlock_irqrestore(&desc->lock, flags);
65		- }
66		- return 0;
67		-}
68	23
69	24	/*
70	25	* do_IRQ handles all normal device IRQs (the special