cpumask fallout: Initialize irq_default_affinity earlier

[linux-2.6-omap-h63xx.git] / kernel / irq / handle.c

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 0bef3ecb7a0e464e1c1966b9db6eff68cd34f197..3aba8d12f328ec91e59f5c72217ceb0c0d2fd0a1 100644 (file)
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -39,6 +39,18 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
        ack_bad_irq(irq);
 }
 
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+static void __init init_irq_default_affinity(void)
+{
+       alloc_bootmem_cpumask_var(&irq_default_affinity);
+       cpumask_setall(irq_default_affinity);
+}
+#else
+static void __init init_irq_default_affinity(void)
+{
+}
+#endif
+
 /*
  * Linux has a controller-independent interrupt architecture.
  * Every controller has a 'controller-template', that is used
@@ -86,11 +98,6 @@ void init_kstat_irqs(struct irq_desc *desc, int cpu, int nr)
                desc->kstat_irqs = (unsigned int *)ptr;
 }
 
-int __weak arch_init_chip_data(struct irq_desc *desc, int cpu)
-{
-       return 0;
-}
-
 static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu)
 {
        memcpy(desc, &irq_desc_init, sizeof(struct irq_desc));
@@ -139,12 +146,15 @@ int __init early_irq_init(void)
        int legacy_count;
        int i;
 
+       init_irq_default_affinity();
+
        desc = irq_desc_legacy;
        legacy_count = ARRAY_SIZE(irq_desc_legacy);
 
        for (i = 0; i < legacy_count; i++) {
                desc[i].irq = i;
                desc[i].kstat_irqs = kstat_irqs_legacy[i];
+               lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
 
                irq_desc_ptrs[i] = desc + i;
        }
@@ -217,6 +227,23 @@ struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
        }
 };
 
+int __init early_irq_init(void)
+{
+       struct irq_desc *desc;
+       int count;
+       int i;
+
+       init_irq_default_affinity();
+
+       desc = irq_desc;
+       count = ARRAY_SIZE(irq_desc);
+
+       for (i = 0; i < count; i++)
+               desc[i].irq = i;
+
+       return arch_early_irq_init();
+}
+
 struct irq_desc *irq_to_desc(unsigned int irq)
 {
        return (irq < NR_IRQS) ? irq_desc + irq : NULL;