From: Joe Korty <joe.korty@ccur.com>
Date: Tue, 11 Apr 2006 05:54:13 +0000 (-0700)
Subject: [PATCH] add cpu_relax to hrtimer_cancel
X-Git-Tag: v2.6.17-rc2~192
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ef37b196467bf2f9d41e5579dd388c08b800f7c;p=linux-2.6

[PATCH] add cpu_relax to hrtimer_cancel

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

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f181ff4dd3..d2a7296c82 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer)
 
 		if (ret >= 0)
 			return ret;
+		cpu_relax();
 	}
 }