2 files changed, 4 insertions, 0 deletions

diff --git a/kernel/futex.c b/kernel/futex.c
index db9824de8bf0..0edd314798c0 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1252,6 +1252,8 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared,
                         t.timer.expires = *abs_time;
 
                         hrtimer_start(&t.timer, t.timer.expires, HRTIMER_MODE_ABS);
+                        if (!hrtimer_active(&t.timer))
+                                t.task = NULL;
 
                         /*
                          * the timer could have already expired, in which
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index bd5d6b5060bc..1069998fe25f 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1315,6 +1315,8 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
 
         } while (t->task && !signal_pending(current));
 
+        __set_current_state(TASK_RUNNING);
+
         return t->task == NULL;
 }