---

yaml --- r: 32628 b: refs/heads/master c: a000965 h: refs/heads/master v: v3
git-mirror · Jul 15, 2006 · 917f1b9 · 917f1b9
1 parent 9af6771
commit 917f1b9
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: 52e92e5788139921352213fa6faf6e30ff1f2f5a
+refs/heads/master: a0009652af385a42f0e0604136f772ead406c78d
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
@@ -374,6 +374,7 @@ int del_timer_sync(struct timer_list *timer)
 		int ret = try_to_del_timer_sync(timer);
 		if (ret >= 0)
 			return ret;
+		cpu_relax();
 	}
 }