Merge branches 'irq/genirq', 'irq/sparseirq' and 'irq/urgent' into irq/core
Ingo Molnar [Fri, 13 Feb 2009 10:57:18 +0000 (11:57 +0100)]
1  2  3  4 
arch/arm/kernel/irq.c
arch/blackfin/kernel/irqchip.c
arch/mips/kernel/irq.c
arch/sparc/kernel/irq_64.c
arch/sparc/kernel/time_64.c
kernel/irq/chip.c
kernel/irq/handle.c
kernel/irq/manage.c
kernel/irq/numa_migrate.c

Simple merge
Simple merge
@@@@@ -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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge