1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/timer.c b/kernel/timer.c
index 510fe69351ca..56becf373c58 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1436,9 +1436,11 @@ static void __cpuinit migrate_timers(int cpu)
         BUG_ON(cpu_online(cpu));
         old_base = per_cpu(tvec_bases, cpu);
         new_base = get_cpu_var(tvec_bases);
-
-        local_irq_disable();
-        spin_lock(&new_base->lock);
+        /*
+         * The caller is globally serialized and nobody else
+         * takes two locks at once, deadlock is not possible.
+         */
+        spin_lock_irq(&new_base->lock);
         spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
 
         BUG_ON(old_base->running_timer);
@@ -1453,8 +1455,7 @@ static void __cpuinit migrate_timers(int cpu)
         }
 
         spin_unlock(&old_base->lock);
-        spin_unlock(&new_base->lock);
-        local_irq_enable();
+        spin_unlock_irq(&new_base->lock);
         put_cpu_var(tvec_bases);
 }
 #endif /* CONFIG_HOTPLUG_CPU */