Merge branch 'timers/urgent' into timers/core

[karo-tx-linux.git] / kernel / time / tick-broadcast.c

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 723c7637e55a2376766776b869d8217fb367b044..c7218d13273861dd65f5a484852001f88d8ce819 100644 (file)
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -456,23 +456,27 @@ void tick_broadcast_oneshot_control(unsigned long reason)
        unsigned long flags;
        int cpu;
 
-       raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
-
        /*
         * Periodic mode does not care about the enter/exit of power
         * states
         */
        if (tick_broadcast_device.mode == TICKDEV_MODE_PERIODIC)
-               goto out;
+               return;
 
-       bc = tick_broadcast_device.evtdev;
+       /*
+        * We are called with preemtion disabled from the depth of the
+        * idle code, so we can't be moved away.
+        */
        cpu = smp_processor_id();
        td = &per_cpu(tick_cpu_device, cpu);
        dev = td->evtdev;
 
        if (!(dev->features & CLOCK_EVT_FEAT_C3STOP))
-               goto out;
+               return;
+
+       bc = tick_broadcast_device.evtdev;
 
+       raw_spin_lock_irqsave(&tick_broadcast_lock, flags);
        if (reason == CLOCK_EVT_NOTIFY_BROADCAST_ENTER) {
                if (!cpumask_test_cpu(cpu, tick_get_broadcast_oneshot_mask())) {
                        cpumask_set_cpu(cpu, tick_get_broadcast_oneshot_mask());
@@ -489,8 +493,6 @@ void tick_broadcast_oneshot_control(unsigned long reason)
                                tick_program_event(dev->next_event, 1);
                }
        }
-
-out:
        raw_spin_unlock_irqrestore(&tick_broadcast_lock, flags);
 }