1 files changed, 6 insertions, 6 deletions

diff --git a/kernel/irq/numa_migrate.c b/kernel/irq/numa_migrate.c
index 3fd30197da2e..963559dbd858 100644
--- a/kernel/irq/numa_migrate.c
+++ b/kernel/irq/numa_migrate.c
@@ -42,7 +42,7 @@ static bool init_copy_one_irq_desc(int irq, struct irq_desc *old_desc,
                                 "for migration.\n", irq);
                 return false;
         }
-        spin_lock_init(&desc->lock);
+        raw_spin_lock_init(&desc->lock);
         desc->node = node;
         lockdep_set_class(&desc->lock, &irq_desc_lock_class);
         init_copy_kstat_irqs(old_desc, desc, node, nr_cpu_ids);
@@ -67,10 +67,10 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
 
         irq = old_desc->irq;
 
-        spin_lock_irqsave(&sparse_irq_lock, flags);
+        raw_spin_lock_irqsave(&sparse_irq_lock, flags);
 
         /* We have to check it to avoid races with another CPU */
-        desc = irq_desc_ptrs[irq];
+        desc = irq_to_desc(irq);
 
         if (desc && old_desc != desc)
                 goto out_unlock;
@@ -90,8 +90,8 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
                 goto out_unlock;
         }
 
-        irq_desc_ptrs[irq] = desc;
-        spin_unlock_irqrestore(&sparse_irq_lock, flags);
+        replace_irq_desc(irq, desc);
+        raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
 
         /* free the old one */
         free_one_irq_desc(old_desc, desc);
@@ -100,7 +100,7 @@ static struct irq_desc *__real_move_irq_desc(struct irq_desc *old_desc,
         return desc;
 
 out_unlock:
-        spin_unlock_irqrestore(&sparse_irq_lock, flags);
+        raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
 
         return desc;
 }