[Xen-changelog] Avoid spurious timer activations in migrate_timer().

[Xen patchbot -3.0-testing <patchbot-3.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 395e0186bd8981bd2067674e65a90e56585ebcd5
# Parent  8821da562fe0199a92f165b444e08fd63ef60296
Avoid spurious timer activations in migrate_timer().

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 8821da562fe0 -r 395e0186bd89 xen/common/timer.c
--- a/xen/common/timer.c        Sat Apr 22 10:29:27 2006 +0100
+++ b/xen/common/timer.c        Sat Apr 22 10:38:27 2006 +0100
@@ -251,12 +251,15 @@ void migrate_timer(struct timer *timer, 
     }
 
     if ( active_timer(timer) )
-        __stop_timer(timer);
-
-    timer->cpu = new_cpu;
-
-    if ( likely(!timer->killed) )
+    {
+        __stop_timer(timer);
+        timer->cpu = new_cpu;
         __add_timer(timer);
+    }
+    else
+    {
+        timer->cpu = new_cpu;
+    }
 
     spin_unlock(&timers[old_cpu].lock);
     spin_unlock_irqrestore(&timers[new_cpu].lock, flags);

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog