From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 10:57:18 +0000 (+0100)
Subject: Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core
X-Git-Tag: v2.6.30-rc1~3^2~10
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=8f8573ae9f5deefada6f5d64d0a52c9b39c730c7;p=cascardo%2Flinux.git

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

8f8573ae9f5deefada6f5d64d0a52c9b39c730c7
diff --cc arch/mips/kernel/irq.c
index a0ff2b66e22b,a0ff2b66e22b,7b845ba9dff4,a0ff2b66e22b..7c2dafa0f584
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@@@@ -108,10 -108,10 -108,9 -108,10 +108,10 @@@@@ int show_interrupts(struct seq_file *p
    		seq_printf(p, "%10u ", kstat_irqs(i));
    #else
    		for_each_online_cpu(j)
-- -			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
++ +			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
    #endif
    		seq_printf(p, " %14s", irq_desc[i].chip->name);
  + 		seq_printf(p, "-%-8s", irq_desc[i].name);
    		seq_printf(p, "  %s", action->name);
    
    		for (action=action->next; action; action = action->next)