diff -NurpP linux-2.6.17.11-vs2.1.1-rc31.2/kernel/posix-timers.c linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/posix-timers.c
--- linux-2.6.17.11-vs2.1.1-rc31.2/kernel/posix-timers.c	2006-08-17 01:24:55 +0200
+++ linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/posix-timers.c	2006-08-30 19:02:32 +0200
@@ -300,10 +300,6 @@ void do_schedule_next_timer(struct sigin
 
 int posix_timer_event(struct k_itimer *timr,int si_private)
 {
-	struct vx_info_save vxis;
-	int ret;
-
-	enter_vx_info(task_get_vx_info(timr->it_process), &vxis);
 	memset(&timr->sigq->info, 0, sizeof(siginfo_t));
 	timr->sigq->info.si_sys_private = si_private;
 	/* Send signal to the process that owns this timer.*/
@@ -316,11 +312,11 @@ int posix_timer_event(struct k_itimer *t
 
 	if (timr->it_sigev_notify & SIGEV_THREAD_ID) {
 		struct task_struct *leader;
+		int ret = send_sigqueue(timr->it_sigev_signo, timr->sigq,
+					timr->it_process);
 
-		ret = send_sigqueue(timr->it_sigev_signo, timr->sigq,
-				    timr->it_process);
 		if (likely(ret >= 0))
-			goto out;
+			return ret;
 
 		timr->it_sigev_notify = SIGEV_SIGNAL;
 		leader = timr->it_process->group_leader;
@@ -328,12 +324,8 @@ int posix_timer_event(struct k_itimer *t
 		timr->it_process = leader;
 	}
 
-	ret = send_group_sigqueue(timr->it_sigev_signo, timr->sigq,
+	return send_group_sigqueue(timr->it_sigev_signo, timr->sigq,
 				  timr->it_process);
-out:
-	leave_vx_info(&vxis);
-	put_vx_info(vxis.vxi);
-	return ret;
 }
 EXPORT_SYMBOL_GPL(posix_timer_event);
 
diff -NurpP linux-2.6.17.11-vs2.1.1-rc31.2/kernel/printk.c linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/printk.c
--- linux-2.6.17.11-vs2.1.1-rc31.2/kernel/printk.c	2006-07-09 17:07:13 +0200
+++ linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/printk.c	2006-08-30 19:02:32 +0200
@@ -471,14 +471,11 @@ __attribute__((weak)) unsigned long long
 
 asmlinkage int printk(const char *fmt, ...)
 {
-	struct vx_info_save vxis;
 	va_list args;
 	int r;
 
 	va_start(args, fmt);
-	__enter_vx_admin(&vxis);
 	r = vprintk(fmt, args);
-	__leave_vx_admin(&vxis);
 	va_end(args);
 
 	return r;
diff -NurpP linux-2.6.17.11-vs2.1.1-rc31.2/kernel/softirq.c linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/softirq.c
--- linux-2.6.17.11-vs2.1.1-rc31.2/kernel/softirq.c	2006-07-09 17:07:14 +0200
+++ linux-2.6.17.11-vs2.1.1-rc31.2r/kernel/softirq.c	2006-08-30 19:02:32 +0200
@@ -75,7 +75,6 @@ static inline void wakeup_softirqd(void)
 
 asmlinkage void __do_softirq(void)
 {
-	struct vx_info_save vxis;
 	struct softirq_action *h;
 	__u32 pending;
 	int max_restart = MAX_SOFTIRQ_RESTART;
@@ -84,7 +83,6 @@ asmlinkage void __do_softirq(void)
 	pending = local_softirq_pending();
 
 	local_bh_disable();
-	__enter_vx_admin(&vxis);
 	cpu = smp_processor_id();
 restart:
 	/* Reset the pending bitmask before enabling irqs */
@@ -112,7 +110,6 @@ restart:
 	if (pending)
 		wakeup_softirqd();
 
-	__leave_vx_admin(&vxis);
 	__local_bh_enable();
 }