diff --git a/[refs] b/[refs] index dd125c5f51e4..3a0df8ee10b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2139a7fbf3effd8cad505871e3a3c308780ada32 +refs/heads/master: b78709cfd4387c15a9894748bcada8a4ca75c561 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index f06d059edef5..cfaf3fabeecd 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4247,7 +4247,7 @@ long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval) if (retval) goto out_unlock; - jiffies_to_timespec(p->policy & SCHED_FIFO ? + jiffies_to_timespec(p->policy == SCHED_FIFO ? 0 : task_timeslice(p), &t); read_unlock(&tasklist_lock); retval = copy_to_user(interval, &t, sizeof(t)) ? -EFAULT : 0;