From: Joe Korty Date: Tue, 11 Apr 2006 05:54:13 +0000 (-0700) Subject: [PATCH] add cpu_relax to hrtimer_cancel X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5ef37b196467bf2f9d41e5579dd388c08b800f7c;p=openwrt%2Fstaging%2Fblogic.git [PATCH] add cpu_relax to hrtimer_cancel Add a cpu_relax() to the hand-coded spinwait in hrtimer_cancel(). Signed-off-by: Joe Korty Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f181ff4dd32e..d2a7296c8251 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -501,6 +501,7 @@ int hrtimer_cancel(struct hrtimer *timer) if (ret >= 0) return ret; + cpu_relax(); } }