Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / kernel / hrtimer.c

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index f181ff4dd32ec18221955508d515c3b8da81c6a6..d2a7296c8251979b67be6a98640025c0181462c5 100644 (file)
--- 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();
        }
 }