diff options
| author | Joe Korty <joe.korty@ccur.com> | 2006-04-11 07:54:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-11 15:18:42 +0200 |
| commit | 5ef37b196467bf2f9d41e5579dd388c08b800f7c (patch) | |
| tree | ea1ea6e4c0f7b34b917fa52948e4939fa4e3eaf1 /kernel/hrtimer.c | |
| parent | [PATCH] uniform POLLRDHUP handling between epoll and poll/select (diff) | |
| download | linux-5ef37b196467bf2f9d41e5579dd388c08b800f7c.tar.xz linux-5ef37b196467bf2f9d41e5579dd388c08b800f7c.zip | |
[PATCH] add cpu_relax to hrtimer_cancel
Add a cpu_relax() to the hand-coded spinwait in hrtimer_cancel().
Signed-off-by: Joe Korty <joe.korty@ccur.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 1 |
1 files changed, 1 insertions, 0 deletions
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(); } } |