1 files changed, 4 insertions, 5 deletions

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 476cb0c0b4a4..de93a8176ca6 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1355,17 +1355,16 @@ static void migrate_hrtimers(int cpu)
         tick_cancel_sched_timer(cpu);
 
         local_irq_disable();
-
-        spin_lock(&new_base->lock);
-        spin_lock(&old_base->lock);
+        double_spin_lock(&new_base->lock, &old_base->lock,
+                         smp_processor_id() < cpu);
 
         for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
                 migrate_hrtimer_list(&old_base->clock_base[i],
                                      &new_base->clock_base[i]);
         }
-        spin_unlock(&old_base->lock);
-        spin_unlock(&new_base->lock);
 
+        double_spin_unlock(&new_base->lock, &old_base->lock,
+                           smp_processor_id() < cpu);
         local_irq_enable();
         put_cpu_var(hrtimer_bases);
 }