include/linux/sched.h |    8 ++++++++
 kernel/sched.c        |   15 +++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

Index: linux-2.6.15-rc7-ck1/include/linux/sched.h
===================================================================
--- linux-2.6.15-rc7-ck1.orig/include/linux/sched.h	2005-12-28 16:53:45.000000000 +1100
+++ linux-2.6.15-rc7-ck1/include/linux/sched.h	2005-12-28 16:53:45.000000000 +1100
@@ -159,6 +159,14 @@ extern unsigned long nr_iowait(void);
 #define SCHED_FIFO		1
 #define SCHED_RR		2
 
+#define SCHED_MIN		0
+#define SCHED_MAX		2
+
+#define SCHED_RANGE(policy)	((policy) >= SCHED_MIN && \
+					(policy) <= SCHED_MAX)
+#define SCHED_RT(policy)	((policy) == SCHED_FIFO || \
+					(policy) == SCHED_RR)
+
 struct sched_param {
 	int sched_priority;
 };
Index: linux-2.6.15-rc7-ck1/kernel/sched.c
===================================================================
--- linux-2.6.15-rc7-ck1.orig/kernel/sched.c	2005-12-28 16:53:45.000000000 +1100
+++ linux-2.6.15-rc7-ck1/kernel/sched.c	2005-12-28 16:53:45.000000000 +1100
@@ -721,8 +721,8 @@ static int effective_prio(task_t *p)
 
 	rr = rr_interval(p);
 	prio += used_slice / rr;
-	if (prio >= MAX_PRIO - 2)
-		prio = MAX_PRIO - 2;
+	if (prio >= MAX_PRIO - 1)
+		prio = MAX_PRIO - 1;
 	return prio;
 }
 
@@ -3506,7 +3506,7 @@ static void __setscheduler(struct task_s
 	BUG_ON(task_queued(p));
 	p->policy = policy;
 	p->rt_priority = prio;
-	if (policy != SCHED_NORMAL)
+	if (SCHED_RT(policy))
 		p->prio = MAX_RT_PRIO-1 - p->rt_priority;
 	else
 		p->prio = p->static_prio;
@@ -3531,8 +3531,7 @@ recheck:
 	/* double check policy once rq lock held */
 	if (policy < 0)
 		policy = oldpolicy = p->policy;
-	else if (policy != SCHED_FIFO && policy != SCHED_RR &&
-				policy != SCHED_NORMAL)
+	else if (!SCHED_RANGE(policy))
 			return -EINVAL;
 	/*
 	 * Valid priorities for SCHED_FIFO and SCHED_RR are
@@ -3542,7 +3541,7 @@ recheck:
 	    (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))
+	if ((!SCHED_RT(policy)) != (param->sched_priority == 0))
 		return -EINVAL;
 
 	/*
@@ -3550,11 +3549,11 @@ recheck:
 	 */
 	if (!capable(CAP_SYS_NICE)) {
 		/* can't change policy */
-		if (policy != p->policy &&
+		if (SCHED_RT(policy) && policy != p->policy &&
 			!p->signal->rlim[RLIMIT_RTPRIO].rlim_cur)
 			return -EPERM;
 		/* can't increase priority */
-		if (policy != SCHED_NORMAL &&
+		if (SCHED_RT(policy) &&
 		    param->sched_priority > p->rt_priority &&
 		    param->sched_priority >
 				p->signal->rlim[RLIMIT_RTPRIO].rlim_cur)