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(); } }