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

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID b2323eefb79e75bdf0b24ac02093bdd70e1f44f5
# Parent  3145b215598c87c35040f9c79f3a3ff1b4d6130a
Avoid spurious timer activations in migrate_timer().

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

diff -r 3145b215598c -r b2323eefb79e xen/common/timer.c
--- a/xen/common/timer.c        Sat Apr 22 10:26:28 2006 +0100
+++ b/xen/common/timer.c        Sat Apr 22 10:37:24 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