---

yaml --- r: 25513 b: refs/heads/master c: 5ef37b1 h: refs/heads/master i: 25511: 75ce824 v: v3
git-mirror · Apr 11, 2006 · 9af4b73 · 9af4b73
1 parent 015c1b1
commit 9af4b73
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer)
 
 		if (ret >= 0)
 			return ret;
+		cpu_relax();
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer) @@
     		if (ret >= 0)
     			return ret;
+    		cpu_relax();
     	}
     }
@@ Expand Down @@