From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 30 Jan 2009 17:23:30 +0000 (+0100)
Subject: Merge branch 'linus' into core/percpu
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c43e0e46adf79c321ed3fbf0351e1005fb8a2413;p=linux-beck.git

Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c
---

c43e0e46adf79c321ed3fbf0351e1005fb8a2413
diff --cc kernel/irq/handle.c
index 375d68cd5bf0,3aba8d12f328..f51eaee921b6
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -133,10 -146,8 +145,12 @@@ int __init early_irq_init(void
  	int legacy_count;
  	int i;
  
+ 	init_irq_default_affinity();
+ 
 +	 /* initialize nr_irqs based on nr_cpu_ids */
 +	arch_probe_nr_irqs();
 +	printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d\n", NR_IRQS, nr_irqs);
 +
  	desc = irq_desc_legacy;
  	legacy_count = ARRAY_SIZE(irq_desc_legacy);
  
@@@ -229,8 -233,8 +243,10 @@@ int __init early_irq_init(void
  	int count;
  	int i;
  
+ 	init_irq_default_affinity();
+ 
 +	printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
 +
  	desc = irq_desc;
  	count = ARRAY_SIZE(irq_desc);