Merge branch 'core/percpu' into x86/core

Conflicts:
	kernel/irq/handle.c

diff --cc kernel/irq/handle.c
index 3aba8d1,375d68c..f51eaee
--- 1/kernel/irq/handle.c
--- 2/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@@ -146,8 -133,10 +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);
  
@@@ -233,8 -229,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);
  

diff --cc kernel/irq/manage.c
Simple merge