Merge branches 'irq/genirq' and 'linus' into irq/core
Ingo Molnar [Mon, 16 Mar 2009 08:20:13 +0000 (09:20 +0100)]
1  2  3 
arch/blackfin/kernel/irqchip.c
arch/mips/kernel/irq.c
arch/parisc/kernel/irq.c
arch/sparc/kernel/irq_64.c
drivers/pci/intr_remapping.c
include/linux/irq.h
kernel/irq/handle.c
kernel/irq/manage.c

Simple merge
@@@@ -108,10 -108,9 -108,9 +108,9 @@@@ 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
@@@@ -709,7 -737,7 -709,7 +737,7 @@@@ int request_irq(unsigned int irq, irq_h
        if (!handler)
                return -EINVAL;
   
-       action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
  -     action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
+ +     action = kzalloc(sizeof(struct irqaction), GFP_KERNEL);
        if (!action)
                return -ENOMEM;