[PATCH] add cpu_relax to hrtimer_cancel
authorJoe Korty <joe.korty@ccur.com>
Tue, 11 Apr 2006 05:54:13 +0000 (22:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Apr 2006 13:18:42 +0000 (06:18 -0700)
Add a cpu_relax() to the hand-coded spinwait in hrtimer_cancel().

Signed-off-by: Joe Korty <joe.korty@ccur.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
kernel/hrtimer.c

index f181ff4dd32ec18221955508d515c3b8da81c6a6..d2a7296c8251979b67be6a98640025c0181462c5 100644 (file)
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer)
 
                if (ret >= 0)
                        return ret;
+               cpu_relax();
        }
 }