diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-23 16:40:13 -0500 |
---|---|---|
committer | Steven Miao <realmz6@gmail.com> | 2014-04-11 11:40:55 -0400 |
commit | e8fac6334d205ebe7b4923b141384b105685a226 (patch) | |
tree | 897c40912ba46194533ca4e7b73d17de3b89c946 /arch | |
parent | 30fc7ebe848fe088969b7a4d26db8f86503d2b90 (diff) |
blackfin:Use generic /proc/interrupts implementation
There is nothing special in that blackfin code. Use the core
implementation.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Steven Miao <realmz6@gmail.com>
Cc: bfin <adi-buildroot-devel@lists.sourceforge.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/Kconfig | 1 | ||||
-rw-r--r-- | arch/blackfin/kernel/irqchip.c | 39 |
2 files changed, 10 insertions, 30 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 9ceccef9c649..f936ee6f5688 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -34,6 +34,7 @@ config BLACKFIN | |||
34 | select ARCH_WANT_IPC_PARSE_VERSION | 34 | select ARCH_WANT_IPC_PARSE_VERSION |
35 | select GENERIC_ATOMIC64 | 35 | select GENERIC_ATOMIC64 |
36 | select GENERIC_IRQ_PROBE | 36 | select GENERIC_IRQ_PROBE |
37 | select GENERIC_IRQ_SHOW | ||
37 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG | 38 | select HAVE_NMI_WATCHDOG if NMI_WATCHDOG |
38 | select GENERIC_SMP_IDLE_THREAD | 39 | select GENERIC_SMP_IDLE_THREAD |
39 | select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS | 40 | select ARCH_USES_GETTIMEOFFSET if !GENERIC_CLOCKEVENTS |
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index ff3d747154ac..0ba25764b8c0 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/kallsyms.h> | 11 | #include <linux/kallsyms.h> |
12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
13 | #include <linux/irq.h> | 13 | #include <linux/irq.h> |
14 | #include <linux/seq_file.h> | ||
14 | #include <asm/irq_handler.h> | 15 | #include <asm/irq_handler.h> |
15 | #include <asm/trace.h> | 16 | #include <asm/trace.h> |
16 | #include <asm/pda.h> | 17 | #include <asm/pda.h> |
@@ -33,37 +34,15 @@ static struct irq_desc bad_irq_desc = { | |||
33 | #endif | 34 | #endif |
34 | 35 | ||
35 | #ifdef CONFIG_PROC_FS | 36 | #ifdef CONFIG_PROC_FS |
36 | int show_interrupts(struct seq_file *p, void *v) | 37 | int arch_show_interrupts(struct seq_file *p, int prec) |
37 | { | 38 | { |
38 | int i = *(loff_t *) v, j; | 39 | int j; |
39 | struct irqaction *action; | 40 | |
40 | unsigned long flags; | 41 | seq_printf(p, "%*s: ", prec, "NMI"); |
41 | 42 | for_each_online_cpu(j) | |
42 | if (i < NR_IRQS) { | 43 | seq_printf(p, "%10u ", cpu_pda[j].__nmi_count); |
43 | struct irq_desc *desc = irq_to_desc(i); | 44 | seq_printf(p, " CORE Non Maskable Interrupt\n"); |
44 | 45 | seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count)); | |
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 | for_each_online_cpu(j) | ||
51 | seq_printf(p, "%10u ", kstat_irqs_cpu(i, j)); | ||
52 | seq_printf(p, " %8s", irq_desc_get_chip(desc)->name); | ||
53 | seq_printf(p, " %s", action->name); | ||
54 | for (action = action->next; action; action = action->next) | ||
55 | seq_printf(p, " %s", action->name); | ||
56 | |||
57 | seq_putc(p, '\n'); | ||
58 | skip: | ||
59 | raw_spin_unlock_irqrestore(&desc->lock, flags); | ||
60 | } else if (i == NR_IRQS) { | ||
61 | seq_printf(p, "NMI: "); | ||
62 | for_each_online_cpu(j) | ||
63 | seq_printf(p, "%10u ", cpu_pda[j].__nmi_count); | ||
64 | seq_printf(p, " CORE Non Maskable Interrupt\n"); | ||
65 | seq_printf(p, "Err: %10u\n", atomic_read(&irq_err_count)); | ||
66 | } | ||
67 | return 0; | 46 | return 0; |
68 | } | 47 | } |
69 | #endif | 48 | #endif |