diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/alpha/kernel/ptrace.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/alpha/kernel/ptrace.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/alpha/kernel/ptrace.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/alpha/kernel/ptrace.c	2006-04-28 04:47:02 +0200
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/m32r/kernel/ptrace.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/m32r/kernel/ptrace.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/m32r/kernel/ptrace.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/m32r/kernel/ptrace.c	2006-04-28 04:47:02 +0200
@@ -25,7 +25,6 @@
 #include <linux/user.h>
 #include <linux/string.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/cacheflush.h>
 #include <asm/io.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/mips/kernel/ptrace32.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/mips/kernel/ptrace32.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/mips/kernel/ptrace32.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/mips/kernel/ptrace32.c	2006-04-28 04:47:02 +0200
@@ -24,7 +24,6 @@
 #include <linux/smp_lock.h>
 #include <linux/user.h>
 #include <linux/security.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/cpu.h>
 #include <asm/dsp.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/powerpc/kernel/ptrace32.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/powerpc/kernel/ptrace32.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/powerpc/kernel/ptrace32.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/powerpc/kernel/ptrace32.c	2006-04-28 04:47:02 +0200
@@ -28,7 +28,6 @@
 #include <linux/user.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/page.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/s390/kernel/ptrace.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/s390/kernel/ptrace.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/s390/kernel/ptrace.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/s390/kernel/ptrace.c	2006-04-28 04:47:02 +0200
@@ -33,7 +33,6 @@
 #include <linux/security.h>
 #include <linux/audit.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/segment.h>
 #include <asm/page.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/sparc/kernel/ptrace.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/sparc/kernel/ptrace.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/sparc/kernel/ptrace.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/sparc/kernel/ptrace.c	2006-04-28 04:47:02 +0200
@@ -19,7 +19,6 @@
 #include <linux/smp_lock.h>
 #include <linux/security.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/sparc64/kernel/ptrace.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/sparc64/kernel/ptrace.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/sparc64/kernel/ptrace.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/sparc64/kernel/ptrace.c	2006-04-28 04:47:02 +0200
@@ -22,7 +22,6 @@
 #include <linux/seccomp.h>
 #include <linux/audit.h>
 #include <linux/signal.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/asi.h>
 #include <asm/pgtable.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/um/kernel/process_kern.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/um/kernel/process_kern.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/um/kernel/process_kern.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/um/kernel/process_kern.c	2006-04-28 04:47:02 +0200
@@ -23,7 +23,6 @@
 #include "linux/proc_fs.h"
 #include "linux/ptrace.h"
 #include "linux/random.h"
-#include "linux/vs_cvirt.h"
 
 #include "asm/unistd.h"
 #include "asm/mman.h"
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/arch/x86_64/ia32/ptrace32.c linux-2.6.16.11-vs2.0.2-rc18.3/arch/x86_64/ia32/ptrace32.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/arch/x86_64/ia32/ptrace32.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/arch/x86_64/ia32/ptrace32.c	2006-04-28 04:47:02 +0200
@@ -18,7 +18,6 @@
 #include <linux/unistd.h>
 #include <linux/mm.h>
 #include <linux/ptrace.h>
-#include <linux/vs_cvirt.h>
 #include <asm/ptrace.h>
 #include <asm/compat.h>
 #include <asm/uaccess.h>
diff -NurpP --minimal linux-2.6.16.11-vs2.0.2-rc18.2/kernel/posix-timers.c linux-2.6.16.11-vs2.0.2-rc18.3/kernel/posix-timers.c
--- linux-2.6.16.11-vs2.0.2-rc18.2/kernel/posix-timers.c	2006-04-26 19:07:50 +0200
+++ linux-2.6.16.11-vs2.0.2-rc18.3/kernel/posix-timers.c	2006-04-28 04:47:02 +0200
@@ -47,7 +47,6 @@
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/module.h>
-#include <linux/vs_cvirt.h>
 
 /*
  * Management arrays for POSIX timers.	 Timers are kept in slab memory