Index: linux-2.6.12-rc2-ck1/include/linux/sched.h
===================================================================
--- linux-2.6.12-rc2-ck1.orig/include/linux/sched.h	2005-04-05 12:46:37.000000000 +1000
+++ linux-2.6.12-rc2-ck1/include/linux/sched.h	2005-04-05 12:46:37.000000000 +1000
@@ -133,6 +133,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.12-rc2-ck1/kernel/sched.c
===================================================================
--- linux-2.6.12-rc2-ck1.orig/kernel/sched.c	2005-04-05 12:46:37.000000000 +1000
+++ linux-2.6.12-rc2-ck1/kernel/sched.c	2005-04-05 12:46:37.000000000 +1000
@@ -3129,7 +3129,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_USER_RT_PRIO-1 - p->rt_priority;
 	else
 		p->prio = p->static_prio;
@@ -3153,8 +3153,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
@@ -3163,11 +3162,10 @@ recheck:
 	if (param->sched_priority < 0 ||
 	    param->sched_priority > MAX_USER_RT_PRIO-1)
 		return -EINVAL;
-	if ((policy == SCHED_NORMAL) != (param->sched_priority == 0))
+	if ((!SCHED_RT(policy)) != (param->sched_priority == 0))
 		return -EINVAL;
 
-	if ((policy == SCHED_FIFO || policy == SCHED_RR) &&
-	    !capable(CAP_SYS_NICE))
+	if (SCHED_RT(policy) && !capable(CAP_SYS_NICE))
 		return -EPERM;
 	if ((current->euid != p->euid) && (current->euid != p->uid) &&
 	    !capable(CAP_SYS_NICE))