diff -urN linux-2.4.22/kernel/nice linux-2.4.22.trustix/kernel/nice
--- linux-2.4.22/kernel/nice	2003-09-15 01:01:16.000000000 +1000
+++ linux-2.4.22.trustix/kernel/nice	2003-09-15 01:01:33.000000000 +1000
@@ -137,7 +137,7 @@
 fork.c:	p->pdeath_signal = 0;
 fork.c:	p->time_slice = (current->time_slice + 1) >> 1;
 fork.c:	p->first_time_slice = 1;
-fork.c:	p->sleep_timestamp = jiffies;
+fork.c:	p->timestamp = jiffies;
 fork.c:	retval = p->pid;
 fork.c:	p->tgid = retval;
 fork.c:	INIT_LIST_HEAD(&p->thread_group);
@@ -186,7 +186,7 @@
 sched.c:		return p->prio;
 sched.c:	bonus = p->best_sleep_avg/BEST_SLEEP_DECAY;
 sched.c:	prio = p->static_prio - bonus;
-sched.c:	long sleep_time = jiffies - p->sleep_timestamp - 1;
+sched.c:	long sleep_time = jiffies - p->timestamp - 1;
 sched.c:		if (p->activated == -1){
 sched.c:			if (p->best_sleep_avg / BEST_SLEEP_DECAY >=
 sched.c:					p->sleep_avg = JUST_INTERACTIVE_SLEEP(p);
@@ -203,7 +203,7 @@
 sched.c:		if (p->sleep_avg * BEST_SLEEP_DECAY > p->best_sleep_avg)
 sched.c:			p->best_sleep_avg = p->sleep_avg * BEST_SLEEP_DECAY;
 sched.c:		p->prio = effective_prio(p);
-sched.c:	unsigned long sleep_time = jiffies - p->sleep_timestamp - 1;
+sched.c:	unsigned long sleep_time = jiffies - p->timestamp - 1;
 sched.c:		if (p->activated != -1)
 sched.c:			p->activated = 1;
 sched.c:	list_del(&p->run_list);
diff -urN linux-2.4.22/kernel/sched.c linux-2.4.22.trustix/kernel/sched.c
--- linux-2.4.22/kernel/sched.c	2003-09-15 01:01:16.000000000 +1000
+++ linux-2.4.22.trustix/kernel/sched.c	2003-09-15 01:01:33.000000000 +1000
@@ -1035,7 +1035,7 @@
 	 */
 
 #define CAN_MIGRATE_TASK(p,rq,this_cpu)					\
-	((jiffies - (p)->sleep_timestamp > cache_decay_ticks) &&	\
+	((jiffies - (p)->timestamp > cache_decay_ticks) &&	\
 		!task_running(rq, p) &&					\
 			((p)->cpus_allowed & (1UL << (this_cpu))))
 
diff -urN linux-2.4.22/net/bluetooth/cmtp/core.c linux-2.4.22.trustix/net/bluetooth/cmtp/core.c
--- linux-2.4.22/net/bluetooth/cmtp/core.c	2003-08-25 21:44:44.000000000 +1000
+++ linux-2.4.22.trustix/net/bluetooth/cmtp/core.c	2003-09-15 01:02:04.000000000 +1000
@@ -298,7 +298,7 @@
 	sigfillset(&current->blocked);
 	flush_signals(current);
 
-	current->nice = -15;
+	set_user_nice(current, -15);
 
 	set_fs(KERNEL_DS);