From 9af4b7357ce8ebec11cad0bb7aadd8d3e494ca87 Mon Sep 17 00:00:00 2001
From: Joe Korty <joe.korty@ccur.com>
Date: Mon, 10 Apr 2006 22:54:13 -0700
Subject: [PATCH] --- yaml --- r: 25513 b: refs/heads/master c:
 5ef37b196467bf2f9d41e5579dd388c08b800f7c h: refs/heads/master i:   25511:
 75ce824eb87167bd855fdc6d91aa6de8ab984133 v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b64ff3f0033c..2f0524daf7df 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2395140ee2bffe38b1c8a59318f62882b797f5e6
+refs/heads/master: 5ef37b196467bf2f9d41e5579dd388c08b800f7c
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index f181ff4dd32e..d2a7296c8251 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer)
 
 		if (ret >= 0)
 			return ret;
+		cpu_relax();
 	}
 }