diff options
| -rw-r--r-- | kernel/irq/handle.c | 2 | ||||
| -rw-r--r-- | kernel/irq/numa_migrate.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 06b05a4d3007..893da67b7781 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c | |||
| @@ -93,6 +93,8 @@ void __attribute__((weak)) arch_init_chip_data(struct irq_desc *desc, int cpu) | |||
| 93 | static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) | 93 | static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) |
| 94 | { | 94 | { |
| 95 | memcpy(desc, &irq_desc_init, sizeof(struct irq_desc)); | 95 | memcpy(desc, &irq_desc_init, sizeof(struct irq_desc)); |
| 96 | |||
| 97 | spin_lock_init(&desc->lock); | ||
| 96 | desc->irq = irq; | 98 | desc->irq = irq; |
| 97 | #ifdef CONFIG_SMP | 99 | #ifdef CONFIG_SMP |
| 98 | desc->cpu = cpu; | 100 | desc->cpu = cpu; |
diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c index a565ce3a4fb5..ecf765c6a77a 100644 --- a/kernel/irq/numa_migrate.c +++ b/kernel/irq/numa_migrate.c | |||
| @@ -42,6 +42,7 @@ static void init_copy_one_irq_desc(int irq, struct irq_desc *old_desc, | |||
| 42 | struct irq_desc *desc, int cpu) | 42 | struct irq_desc *desc, int cpu) |
| 43 | { | 43 | { |
| 44 | memcpy(desc, old_desc, sizeof(struct irq_desc)); | 44 | memcpy(desc, old_desc, sizeof(struct irq_desc)); |
| 45 | spin_lock_init(&desc->lock); | ||
| 45 | desc->cpu = cpu; | 46 | desc->cpu = cpu; |
| 46 | lockdep_set_class(&desc->lock, &irq_desc_lock_class); | 47 | lockdep_set_class(&desc->lock, &irq_desc_lock_class); |
| 47 | init_copy_kstat_irqs(old_desc, desc, cpu, nr_cpu_ids); | 48 | init_copy_kstat_irqs(old_desc, desc, cpu, nr_cpu_ids); |
