From: Joe Korty <joe.korty@ccur.com>

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>
---

 kernel/hrtimer.c |    1 +
 1 files changed, 1 insertion(+)

diff -puN kernel/hrtimer.c~add-cpu_relax-to-hrtimer_cancel kernel/hrtimer.c
--- devel/kernel/hrtimer.c~add-cpu_relax-to-hrtimer_cancel	2006-04-03 20:52:56.000000000 -0700
+++ devel-akpm/kernel/hrtimer.c	2006-04-03 20:52:56.000000000 -0700
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer
 
 		if (ret >= 0)
 			return ret;
+		cpu_relax();
 	}
 }
 
_