- sync vserver branch: will help future merges

diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index dcac98d..e4297b1 100644 (file)
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -18,8 +18,6 @@
 #include <linux/init.h>
 #include <linux/idr.h>
 #include <linux/namei.h>
-#include <linux/vs_base.h>
-#include <linux/vserver/inode.h>
 #include <linux/bitops.h>
 #include <linux/vserver/inode.h>
 #include <asm/uaccess.h>

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 6264575..193df54 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -45,8 +45,6 @@
 #include <linux/sysrq.h>
 #include <linux/vmalloc.h>
 #include <linux/crash_dump.h>
-#include <linux/vs_base.h>
-#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>