Merge branch 'linus' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Fri, 30 Jan 2009 17:23:30 +0000 (18:23 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 30 Jan 2009 17:23:30 +0000 (18:23 +0100)
Conflicts:
kernel/irq/handle.c

1  2 
include/linux/sched.h
kernel/irq/handle.c
kernel/irq/manage.c

Simple merge
index 375d68cd5bf0dd298d90d8d2c3ccb7764c5506b8,3aba8d12f328ec91e59f5c72217ceb0c0d2fd0a1..f51eaee921b603b202bf184cdfdaee3a8da2ca08
@@@ -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);
  
Simple merge