From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:13:52 +0000 (+0000)
Subject: - sync vserver branch:  will help future merges
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~145
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=26194b0210e0d6a8f55045a4e449953fe506b127;p=linux-2.6.git

- sync vserver branch:  will help future merges
---

diff --git a/include/linux/types.h b/include/linux/types.h
index 96f664f4a..bc227ccb3 100644
--- 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 c36b4805a..4078538f5 100644
--- 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 621c64fea..b8e325dbf 100644
--- 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 66ecd0beb..21da50d03 100644
--- 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 8c72f883d..2dae80d60 100644
--- 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 645ab4e48..c80338815 100644
--- 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 0c43a4b36..f952eb669 100644
--- 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>