From 917f1b9fda39b9833a27c0358f4348fedce0a037 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Fri, 14 Jul 2006 00:24:06 -0700
Subject: [PATCH] --- yaml --- r: 32628 b: refs/heads/master c:
 a0009652af385a42f0e0604136f772ead406c78d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c196765d0247..c74ff74c2928 100644
--- 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
index 2a87430a58d4..acfa557e685b 100644
--- 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();
 	}
 }