diff options
| author | Peter Williams <pwil3058@bigpond.net.au> | 2006-06-26 08:58:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:02:41 +0200 |
| commit | b78709cfd4387c15a9894748bcada8a4ca75c561 (patch) | |
| tree | 999f5beae5983280fa1c3d98cefb47ee4a95d83b /kernel | |
| parent | [PATCH] initramfs overwrite fix (diff) | |
| download | linux-b78709cfd4387c15a9894748bcada8a4ca75c561.tar.xz linux-b78709cfd4387c15a9894748bcada8a4ca75c561.zip | |
[PATCH] sched: fix SCHED_FIFO bug in sys_sched_rr_get_interval()
The introduction of SCHED_BATCH scheduling class with a value of 3 means
that the expression (p->policy & SCHED_FIFO) will return true if policy
is SCHED_BATCH or SCHED_FIFO.
Unfortunately, this expression is used in sys_sched_rr_get_interval()
and in the absence of a comment to say that this is intentional I
presume that it is unintentional and erroneous.
The fix is to change the expression to (p->policy == SCHED_FIFO).
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index f06d059edef5..cfaf3fabeecd 100644 --- a/kernel/sched.c +++ b/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; |