Merge branches 'x86-ras-for-linus', 'x86-uv-for-linus' and 'x86-vdso-for-linus' of...

[firefly-linux-kernel-4.4.55.git] / kernel / time / hrtimer.c

diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 1c2fe7de28427c6393b61374b5871971fcffc240..ab370ffffd53dc5d826137c796df5c32afe81abf 100644 (file)
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1776,7 +1776,6 @@ schedule_hrtimeout_range_clock(ktime_t *expires, unsigned long delta,
         */
        if (!expires) {
                schedule();
-               __set_current_state(TASK_RUNNING);
                return -EINTR;
        }