[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.

Steven Rostedt committed 21 years ago

Commit d46523e1 parent 18586e72 files · +4 −3Browse files

Unified · Split

2 files

arch/ia64/sn/kernel/xpc_main.c +1 −1
kernel/sched.c +3 −2

arch/ia64/sn/kernel/xpc_main.c+1−1

@@ -420,7 +420,7 @@ xpc_activating(void *__partid) · 419 unmodified lines
420	partid_t partid = (u64) __partid;	420	partid_t partid = (u64) __partid;
421	struct xpc_partition *part = &xpc_partitions[partid];	421	struct xpc_partition *part = &xpc_partitions[partid];
422	unsigned long irq_flags;	422	unsigned long irq_flags;
423	struct sched_param param = { sched_priority: MAX_USER_RT_PRIO - 1 };	423	struct sched_param param = { sched_priority: MAX_RT_PRIO - 1 };
424	int ret;	424	int ret;
425		425
426		426

kernel/sched.c+3−2

 	p->policy = policy;
 	p->rt_priority = prio;
 	if (policy != SCHED_NORMAL)
-		p->prio = MAX_USER_RT_PRIO-1 - p->rt_priority;
+		p->prio = MAX_RT_PRIO-1 - p->rt_priority;
 	else
 		p->prio = p->static_prio;
 }
 	 * 1..MAX_USER_RT_PRIO-1, valid priority for SCHED_NORMAL is 0.
 	 */
 	if (param->sched_priority < 0 ||
-	    param->sched_priority > MAX_USER_RT_PRIO-1)
+	    (p->mm &&  param->sched_priority > MAX_USER_RT_PRIO-1) ||
+	    (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
 		return -EINVAL;
 	if ((policy == SCHED_NORMAL) != (param->sched_priority == 0))
 		return -EINVAL;