diff options
| -rw-r--r-- | fs/proc/interrupts.c | 4 | ||||
| -rw-r--r-- | kernel/irq/proc.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c index cb0edc7cbf09..1ab4e4b1c28b 100644 --- a/fs/proc/interrupts.c +++ b/fs/proc/interrupts.c @@ -5,6 +5,7 @@ #include <linux/irqnr.h> #include <linux/proc_fs.h> #include <linux/seq_file.h> +#include <linux/kdb.h> /* * /proc/interrupts @@ -34,9 +35,12 @@ static const struct seq_operations int_seq_ops = { .show = show_interrupts }; +DEFINE_KDB_SEQ_FILE(interrupts, "Show /proc/interrupts", &int_seq_ops) + static int __init proc_interrupts_init(void) { proc_create_seq("interrupts", 0, NULL, &int_seq_ops); + register_kdb_seq_file_interrupts(); return 0; } fs_initcall(proc_interrupts_init); diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c index 623b8136e9af..3fa735257b03 100644 --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -12,6 +12,7 @@ #include <linux/interrupt.h> #include <linux/kernel_stat.h> #include <linux/mutex.h> +#include <linux/kgdb.h> #include "internals.h" @@ -501,7 +502,11 @@ int show_interrupts(struct seq_file *p, void *v) seq_printf(p, "%10u ", desc->kstat_irqs ? *per_cpu_ptr(desc->kstat_irqs, j) : 0); - raw_spin_lock_irqsave(&desc->lock, flags); + if (!raw_spin_lock_irqsave_dbg(&desc->lock, flags)) { + seq_printf(p, " <descriptor is locked>\n"); + goto outsparse; + } + if (desc->irq_data.chip) { if (desc->irq_data.chip->irq_print_chip) desc->irq_data.chip->irq_print_chip(&desc->irq_data, p); |