From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 16 Mar 2009 08:20:13 +0000 (+0100)
Subject: Merge branches 'irq/genirq' and 'linus' into irq/core
X-Git-Tag: v2.6.30-rc1~3^2~9
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=edb35028e40515beb2f94808aff8b3e71fb9f35a;p=linux.git

Merge branches 'irq/genirq' and 'linus' into irq/core
---

edb35028e40515beb2f94808aff8b3e71fb9f35a
diff --cc arch/mips/kernel/irq.c
index 7c2dafa0f584,4b4007b3083a,4b4007b3083a..7b845ba9dff4
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@@@ -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)
diff --cc kernel/irq/manage.c
index cbc3828faf5f,8a22039a90ba,291f03664552..ea119effe096
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@@@ -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;