- sync vserver branch: will help future merges

diff --git a/include/linux/types.h b/include/linux/types.h
index 96f664f..bc227cc 100644 (file)
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -36,8 +36,6 @@ typedef __kernel_uid32_t      uid_t;
 typedef __kernel_gid32_t       gid_t;
 typedef __kernel_uid16_t        uid16_t;
 typedef __kernel_gid16_t        gid16_t;
-
-/* The following two typedef's are for vserver */
 typedef unsigned int           xid_t;
 typedef unsigned int           nid_t;
 

diff --git a/include/linux/vs_limit.h b/include/linux/vs_limit.h
index c36b480..4078538 100644 (file)
--- a/include/linux/vs_limit.h
+++ b/include/linux/vs_limit.h
@@ -57,6 +57,7 @@ static inline void __vx_add_cres(struct vx_info *vxi,
                atomic_add(amount, &vxi->limit.rcur[res]);
 }
 
+
 /* process and file limits */
 
 #define vx_nproc_inc(p) \
@@ -126,6 +127,7 @@ static inline int __vx_cres_avail(struct vx_info *vxi,
 #define vx_openfd_avail(n) \
        vx_cres_avail(current->vx_info, n, VLIMIT_OPENFD)
 
+
 /* socket limits */
 
 #define vx_sock_inc(s) \

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 621c64f..b8e325d 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -1,8 +1,5 @@
 #ifndef __LINUX_NET_AFUNIX_H
 #define __LINUX_NET_AFUNIX_H
-
-#include <linux/vs_base.h>
-
 extern void unix_inflight(struct file *fp);
 extern void unix_notinflight(struct file *fp);
 extern void unix_gc(void);

diff --git a/ipc/msg.c b/ipc/msg.c
index 66ecd0b..21da50d 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -24,7 +24,6 @@
 #include <linux/list.h>
 #include <linux/security.h>
 #include <linux/sched.h>
-#include <linux/vs_base.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <asm/current.h>

diff --git a/ipc/sem.c b/ipc/sem.c
index 8c72f88..2dae80d 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -71,7 +71,6 @@
 #include <linux/time.h>
 #include <linux/smp_lock.h>
 #include <linux/security.h>
-#include <linux/vs_base.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <asm/uaccess.h>

diff --git a/ipc/util.c b/ipc/util.c
index 645ab4e..c803388 100644 (file)
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -24,9 +24,6 @@
 #include <linux/security.h>
 #include <linux/rcupdate.h>
 #include <linux/workqueue.h>
-#include <linux/vs_base.h>
-
-#include <asm/unistd.h>
 
 #include <asm/unistd.h>
 

diff --git a/kernel/capability.c b/kernel/capability.c
index 0c43a4b..f952eb6 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -10,7 +10,6 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/security.h>
-#include <linux/vs_cvirt.h>
 #include <linux/syscalls.h>
 #include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>