leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core

Browse Source
This commit is contained in:
Ingo Molnar
2009-02-13 11:57:18 +01:00
parent 37bed90094 0e43785c57 005bf0e6fa 548c893380
commit 8f8573ae9f
33 changed files with 97 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/h8300/kernel/irq.c
View File

@@ -183,7 +183,7 @@ asmlinkage void do_IRQ(int irq)
#if defined(CONFIG_PROC_FS)
int show_interrupts(struct seq_file *p, void *v)
{
int i = *(loff_t *) v, j;
int i = *(loff_t *) v;
struct irqaction * action;
unsigned long flags;
@@ -196,7 +196,7 @@ int show_interrupts(struct seq_file *p, void *v)
if (!action)
goto unlock;
seq_printf(p, "%3d: ",i);
seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
seq_printf(p, "%10u ", kstat_irqs(i));
seq_printf(p, " %14s", irq_desc[i].chip->name);
seq_printf(p, "-%-8s", irq_desc[i].name);
seq_printf(p, " %s", action->name);