Merge home:v2.5/linux

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

Merge home:v2.5/linux
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
1bb563db · Linus Torvalds · Linus Torvalds · f6d9330e · 7957f703 · 1bb563db
Commit 1bb563db authored Apr 20, 2003 by Linus Torvalds Committed by Linus Torvalds Apr 20, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kernel/sched.c kernel/sched.c +1 -1

No files found.
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1666,7 +1666,7 @@ asmlinkage long sys_nice(int increment)
 */
 int task_prio(task_t *p)
 {
-	return p->prio - MAX_USER_RT_PRIO;
+	return p->prio - MAX_RT_PRIO;
 }

 /**