diff options
Diffstat (limited to 'kernel/irq/handle.c')
-rw-r--r-- | kernel/irq/handle.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index b8fa1354f01c..f01c0a30cb42 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
@@ -85,8 +85,6 @@ void init_kstat_irqs(struct irq_desc *desc, int cpu, int nr) | |||
85 | 85 | ||
86 | static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) | 86 | static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) |
87 | { | 87 | { |
88 | int node = cpu_to_node(cpu); | ||
89 | |||
90 | memcpy(desc, &irq_desc_init, sizeof(struct irq_desc)); | 88 | memcpy(desc, &irq_desc_init, sizeof(struct irq_desc)); |
91 | 89 | ||
92 | spin_lock_init(&desc->lock); | 90 | spin_lock_init(&desc->lock); |
@@ -100,7 +98,7 @@ static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) | |||
100 | printk(KERN_ERR "can not alloc kstat_irqs\n"); | 98 | printk(KERN_ERR "can not alloc kstat_irqs\n"); |
101 | BUG_ON(1); | 99 | BUG_ON(1); |
102 | } | 100 | } |
103 | if (!init_alloc_desc_masks(desc, node, false)) { | 101 | if (!init_alloc_desc_masks(desc, cpu, false)) { |
104 | printk(KERN_ERR "can not alloc irq_desc cpumasks\n"); | 102 | printk(KERN_ERR "can not alloc irq_desc cpumasks\n"); |
105 | BUG_ON(1); | 103 | BUG_ON(1); |
106 | } | 104 | } |
@@ -188,10 +186,6 @@ struct irq_desc *irq_to_desc_alloc_cpu(unsigned int irq, int cpu) | |||
188 | printk(KERN_ERR "can not alloc irq_desc\n"); | 186 | printk(KERN_ERR "can not alloc irq_desc\n"); |
189 | BUG_ON(1); | 187 | BUG_ON(1); |
190 | } | 188 | } |
191 | if (!init_alloc_desc_masks(desc, node, false)) { | ||
192 | printk(KERN_ERR "can not alloc irq_desc cpumasks\n"); | ||
193 | BUG_ON(1); | ||
194 | } | ||
195 | init_one_irq_desc(irq, desc, cpu); | 189 | init_one_irq_desc(irq, desc, cpu); |
196 | 190 | ||
197 | irq_desc_ptrs[irq] = desc; | 191 | irq_desc_ptrs[irq] = desc; |