Index: linux-2.6.9-rc3-bk6/include/linux/sched.h
===================================================================
--- linux-2.6.9-rc3-bk6.orig/include/linux/sched.h	2004-10-07 10:30:27.765625824 +1000
+++ linux-2.6.9-rc3-bk6/include/linux/sched.h	2004-10-07 10:34:48.077052472 +1000
@@ -127,6 +127,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.9-rc3-bk6/kernel/sched.c
===================================================================
--- linux-2.6.9-rc3-bk6.orig/kernel/sched.c	2004-10-07 10:34:43.208792560 +1000
+++ linux-2.6.9-rc3-bk6/kernel/sched.c	2004-10-07 10:34:48.079052168 +1000
@@ -2908,7 +2908,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;
@@ -2954,9 +2954,8 @@ static int setscheduler(pid_t pid, int p
 		policy = p->policy;
 	else {
 		retval = -EINVAL;
-		if (policy != SCHED_FIFO && policy != SCHED_RR &&
-				policy != SCHED_NORMAL)
-			goto out_unlock;
+		if (!SCHED_RANGE(policy))
+				goto out_unlock;
 	}
 	profile_hit(SCHED_PROFILING, __builtin_return_address(0));
 
@@ -2967,12 +2966,11 @@ static int setscheduler(pid_t pid, int p
 	retval = -EINVAL;
 	if (lp.sched_priority < 0 || lp.sched_priority > MAX_USER_RT_PRIO-1)
 		goto out_unlock;
-	if ((policy == SCHED_NORMAL) != (lp.sched_priority == 0))
-		goto out_unlock;
+	if (!SCHED_RT(policy) != (lp.sched_priority == 0))
+			goto out_unlock;
 
 	retval = -EPERM;
-	if ((policy == SCHED_FIFO || policy == SCHED_RR) &&
-	    !capable(CAP_SYS_NICE))
+	if (SCHED_RT(policy) && !capable(CAP_SYS_NICE))
 		goto out_unlock;
 	if ((current->euid != p->euid) && (current->euid != p->uid) &&
 	    !capable(CAP_SYS_NICE))