浏览代码

genirq: show_interrupts: Check desc->name before printing it blindly

desc->name is not required and not used by all architectures.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Thomas Gleixner 14 年之前
父节点
当前提交
ee0401ec11
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      kernel/irq/proc.c

+ 2 - 1
kernel/irq/proc.c

@@ -405,7 +405,8 @@ int show_interrupts(struct seq_file *p, void *v)
 	for_each_online_cpu(j)
 	for_each_online_cpu(j)
 		seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 		seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 	seq_printf(p, " %8s", desc->irq_data.chip->name);
 	seq_printf(p, " %8s", desc->irq_data.chip->name);
-	seq_printf(p, "-%-8s", desc->name);
+	if (desc->name)
+		seq_printf(p, "-%-8s", desc->name);
 
 
 	if (action) {
 	if (action) {
 		seq_printf(p, "  %s", action->name);
 		seq_printf(p, "  %s", action->name);