summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-07-14 00:24:06 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-14 21:53:52 -0700
commita0009652af385a42f0e0604136f772ead406c78d (patch)
tree166224a3c3239ae5f7bd07759dd70b9bb2d95e28 /kernel
parent52e92e5788139921352213fa6faf6e30ff1f2f5a (diff)
downloadlinux-a0009652af385a42f0e0604136f772ead406c78d.tar.gz
linux-a0009652af385a42f0e0604136f772ead406c78d.tar.bz2
linux-a0009652af385a42f0e0604136f772ead406c78d.zip
[PATCH] del_timer_sync(): add cpu_relax()
Relax the CPU in the del_timer_sync() busywait loop. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/timer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index 2a87430a58d4..acfa557e685b 100644
--- a/kernel/timer.c
+++ b/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();
}
}