aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2005-07-25 16:28:39 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-26 18:40:00 -0400
commitd46523ea32a79fbc8cd1237f9441f45cc3f02456 (patch)
tree0afe4590170ad25e38005f72431680ba47ba6860 /kernel/sched.c
parent18586e721636527cb5177467fb17e2350615978a (diff)
[PATCH] fix MAX_USER_RT_PRIO and MAX_RT_PRIO
Here's the patch again to fix the code to handle if the values between MAX_USER_RT_PRIO and MAX_RT_PRIO are different. Without this patch, an SMP system will crash if the values are different. Signed-off-by: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index a5fb654ea590..a646e4f36c41 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3486,7 +3486,7 @@ static void __setscheduler(struct task_struct *p, int policy, int prio)
3486 p->policy = policy; 3486 p->policy = policy;
3487 p->rt_priority = prio; 3487 p->rt_priority = prio;
3488 if (policy != SCHED_NORMAL) 3488 if (policy != SCHED_NORMAL)
3489 p->prio = MAX_USER_RT_PRIO-1 - p->rt_priority; 3489 p->prio = MAX_RT_PRIO-1 - p->rt_priority;
3490 else 3490 else
3491 p->prio = p->static_prio; 3491 p->prio = p->static_prio;
3492} 3492}
@@ -3518,7 +3518,8 @@ recheck:
3518 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL is 0. 3518 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL is 0.
3519 */ 3519 */
3520 if (param->sched_priority < 0 || 3520 if (param->sched_priority < 0 ||
3521 param->sched_priority > MAX_USER_RT_PRIO-1) 3521 (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
3522 (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
3522 return -EINVAL; 3523 return -EINVAL;
3523 if ((policy == SCHED_NORMAL) != (param->sched_priority == 0)) 3524 if ((policy == SCHED_NORMAL) != (param->sched_priority == 0))
3524 return -EINVAL; 3525 return -EINVAL;