From 62dcde1ad8de4163cc79b988376edbd403f2267b Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Mon, 26 Jun 2006 16:58:00 +1000 Subject: [PATCH] --- yaml --- r: 30388 b: refs/heads/master c: b78709cfd4387c15a9894748bcada8a4ca75c561 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;