1 files changed, 26 insertions, 10 deletions

diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 00bb0aeea1d0..948b50e78549 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -54,14 +54,25 @@ static void __init init_irq_default_affinity(void)
 #endif
 
 #ifdef CONFIG_SMP
-static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)
+static int alloc_masks(struct irq_desc *desc, int node)
 {
         if (!zalloc_cpumask_var_node(&desc->irq_common_data.affinity,
-                                     gfp, node))
+                                     GFP_KERNEL, node))
                 return -ENOMEM;
 
+#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK
+        if (!zalloc_cpumask_var_node(&desc->irq_common_data.effective_affinity,
+                                     GFP_KERNEL, node)) {
+                free_cpumask_var(desc->irq_common_data.affinity);
+                return -ENOMEM;
+        }
+#endif
+
 #ifdef CONFIG_GENERIC_PENDING_IRQ
-        if (!zalloc_cpumask_var_node(&desc->pending_mask, gfp, node)) {
+        if (!zalloc_cpumask_var_node(&desc->pending_mask, GFP_KERNEL, node)) {
+#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK
+                free_cpumask_var(desc->irq_common_data.effective_affinity);
+#endif
                 free_cpumask_var(desc->irq_common_data.affinity);
                 return -ENOMEM;
         }
@@ -86,7 +97,7 @@ static void desc_smp_init(struct irq_desc *desc, int node,
 
 #else
 static inline int
-alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) { return 0; }
+alloc_masks(struct irq_desc *desc, int node) { return 0; }
 static inline void
 desc_smp_init(struct irq_desc *desc, int node, const struct cpumask *affinity) { }
 #endif
@@ -105,6 +116,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,
         desc->irq_data.chip_data = NULL;
         irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS);
         irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED);
+        irqd_set(&desc->irq_data, IRQD_IRQ_MASKED);
         desc->handle_irq = handle_bad_irq;
         desc->depth = 1;
         desc->irq_count = 0;
@@ -324,6 +336,9 @@ static void free_masks(struct irq_desc *desc)
         free_cpumask_var(desc->pending_mask);
 #endif
         free_cpumask_var(desc->irq_common_data.affinity);
+#ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK
+        free_cpumask_var(desc->irq_common_data.effective_affinity);
+#endif
 }
 #else
 static inline void free_masks(struct irq_desc *desc) { }
@@ -344,9 +359,8 @@ static struct irq_desc *alloc_desc(int irq, int node, unsigned int flags,
                                    struct module *owner)
 {
         struct irq_desc *desc;
-        gfp_t gfp = GFP_KERNEL;
 
-        desc = kzalloc_node(sizeof(*desc), gfp, node);
+        desc = kzalloc_node(sizeof(*desc), GFP_KERNEL, node);
         if (!desc)
                 return NULL;
         /* allocate based on nr_cpu_ids */
@@ -354,7 +368,7 @@ static struct irq_desc *alloc_desc(int irq, int node, unsigned int flags,
         if (!desc->kstat_irqs)
                 goto err_desc;
 
-        if (alloc_masks(desc, gfp, node))
+        if (alloc_masks(desc, node))
                 goto err_kstat;
 
         raw_spin_lock_init(&desc->lock);
@@ -394,6 +408,7 @@ static void free_desc(unsigned int irq)
 {
         struct irq_desc *desc = irq_to_desc(irq);
 
+        irq_remove_debugfs_entry(desc);
         unregister_irq_proc(irq, desc);
 
         /*
@@ -480,7 +495,8 @@ int __init early_irq_init(void)
 
         /* Let arch update nr_irqs and return the nr of preallocated irqs */
         initcnt = arch_probe_nr_irqs();
-        printk(KERN_INFO "NR_IRQS:%d nr_irqs:%d %d\n", NR_IRQS, nr_irqs, initcnt);
+        printk(KERN_INFO "NR_IRQS: %d, nr_irqs: %d, preallocated irqs: %d\n",
+               NR_IRQS, nr_irqs, initcnt);
 
         if (WARN_ON(nr_irqs > IRQ_BITMAP_BITS))
                 nr_irqs = IRQ_BITMAP_BITS;
@@ -516,14 +532,14 @@ int __init early_irq_init(void)
 
         init_irq_default_affinity();
 
-        printk(KERN_INFO "NR_IRQS:%d\n", NR_IRQS);
+        printk(KERN_INFO "NR_IRQS: %d\n", NR_IRQS);
 
         desc = irq_desc;
         count = ARRAY_SIZE(irq_desc);
 
         for (i = 0; i < count; i++) {
                 desc[i].kstat_irqs = alloc_percpu(unsigned int);
-                alloc_masks(&desc[i], GFP_KERNEL, node);
+                alloc_masks(&desc[i], node);
                 raw_spin_lock_init(&desc[i].lock);
                 lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
                 desc_set_defaults(i, &desc[i], node, NULL, NULL);