2 files changed, 3 insertions, 4 deletions

diff --git a/fs/select.c b/fs/select.c
index 5e61b43d0766..fdd8584e536d 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -46,7 +46,7 @@ static unsigned long __estimate_accuracy(struct timespec *tv)
         unsigned long slack;
         int divfactor = 1000;
 
-        if (task_nice(current))
+        if (task_nice(current) > 0)
                 divfactor = divfactor / 5;
 
         slack = tv->tv_nsec / divfactor;
@@ -66,8 +66,7 @@ static unsigned long estimate_accuracy(struct timespec *tv)
          * Realtime tasks get a slack of 0 for obvious reasons.
          */
 
-        if (current->policy == SCHED_FIFO ||
-                current->policy == SCHED_RR)
+        if (rt_task(current))
                 return 0;
 
         ktime_get_ts(&now);
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 1c0473e8ecb4..95db11f62ff2 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -363,7 +363,7 @@ static inline int hrtimer_start_expires(struct hrtimer *timer,
         soft = hrtimer_get_softexpires(timer);
         hard = hrtimer_get_expires(timer);
         delta = ktime_to_ns(ktime_sub(hard, soft));
-        return hrtimer_start_range_ns(timer, hrtimer_get_expires(timer), delta, mode);
+        return hrtimer_start_range_ns(timer, soft, delta, mode);
 }
 
 static inline int hrtimer_restart(struct hrtimer *timer)