From 9c624c6de9e2fd1fa3114c496d01e58fac6390c7 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Fri, 29 Jun 2007 00:29:43 +0000
Subject: [PATCH] revert #include statement to be just like imported FC+VS code

---
 kernel/capability.c        | 1 -
 kernel/irq/handle.c        | 2 --
 kernel/vserver/cvirt.c     | 1 -
 kernel/vserver/dlimit.c    | 3 +--
 kernel/vserver/helper.c    | 1 -
 kernel/vserver/legacy.c    | 1 -
 kernel/vserver/legacynet.c | 1 -
 kernel/vserver/limit.c     | 2 +-
 kernel/vserver/network.c   | 1 -
 kernel/vserver/proc.c      | 2 +-
 kernel/vserver/signal.c    | 2 +-
 11 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/kernel/capability.c b/kernel/capability.c
index 7b9ce8514..b6df40420 100644
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -14,7 +14,6 @@
 #include <linux/syscalls.h>
 #include <linux/vs_context.h>
 #include <asm/uaccess.h>
-#include <linux/vs_base.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
 kernel_cap_t cap_bset = CAP_INIT_EFF_SET;
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index ed8f4d507..aff1f0fab 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -15,8 +15,6 @@
 #include <linux/random.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
-#include <linux/vs_base.h>
-#include <linux/vs_context.h>
 
 #include "internals.h"
 
diff --git a/kernel/vserver/cvirt.c b/kernel/vserver/cvirt.c
index 951fe6c66..00a3a6a90 100644
--- a/kernel/vserver/cvirt.c
+++ b/kernel/vserver/cvirt.c
@@ -14,7 +14,6 @@
 #include <linux/sched.h>
 #include <linux/sysctl.h>
 #include <linux/types.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_cvirt.h>
 #include <linux/vserver/switch.h>
diff --git a/kernel/vserver/dlimit.c b/kernel/vserver/dlimit.c
index 96d7fd2d3..e1ebf8c4c 100644
--- a/kernel/vserver/dlimit.c
+++ b/kernel/vserver/dlimit.c
@@ -15,11 +15,10 @@
 #include <linux/namei.h>
 #include <linux/statfs.h>
 #include <linux/compat.h>
-#include <linux/vs_base.h>
+#include <linux/vserver/switch.h>
 #include <linux/vs_context.h>
 #include <linux/vs_tag.h>
 #include <linux/vs_dlimit.h>
-#include <linux/vserver/switch.h>
 #include <linux/vserver/dlimit_cmd.h>
 
 #include <asm/errno.h>
diff --git a/kernel/vserver/helper.c b/kernel/vserver/helper.c
index 78abeb070..60f570fa1 100644
--- a/kernel/vserver/helper.c
+++ b/kernel/vserver/helper.c
@@ -13,7 +13,6 @@
 #include <linux/kmod.h>
 #include <linux/sched.h>
 #include <linux/reboot.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/signal.h>
diff --git a/kernel/vserver/legacy.c b/kernel/vserver/legacy.c
index a2a35fc3f..51533ac5f 100644
--- a/kernel/vserver/legacy.c
+++ b/kernel/vserver/legacy.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/sched.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/legacy.h>
diff --git a/kernel/vserver/legacynet.c b/kernel/vserver/legacynet.c
index 4195d016a..ede3ca6f0 100644
--- a/kernel/vserver/legacynet.c
+++ b/kernel/vserver/legacynet.c
@@ -12,7 +12,6 @@
  */
 
 #include <linux/sched.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vserver/legacy.h>
diff --git a/kernel/vserver/limit.c b/kernel/vserver/limit.c
index f3af5d073..2739c1d4c 100644
--- a/kernel/vserver/limit.c
+++ b/kernel/vserver/limit.c
@@ -11,9 +11,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_limit.h>
+#include <linux/vserver/limit.h>
 #include <linux/vserver/switch.h>
 #include <linux/vserver/limit_cmd.h>
 
diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
index fedbd2e0d..9dd163719 100644
--- a/kernel/vserver/network.c
+++ b/kernel/vserver/network.c
@@ -18,7 +18,6 @@
 #include <linux/slab.h>
 #include <linux/rcupdate.h>
 #include <net/tcp.h>
-#include <linux/vserver/network_cmd.h>
 
 #include <asm/errno.h>
 #include <linux/vserver/base.h>
diff --git a/kernel/vserver/proc.c b/kernel/vserver/proc.c
index aa38ee5b2..f21e28346 100644
--- a/kernel/vserver/proc.c
+++ b/kernel/vserver/proc.c
@@ -19,10 +19,10 @@
 #include <linux/errno.h>
 #include <linux/proc_fs.h>
 #include <linux/sched.h>
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vs_network.h>
 #include <linux/vs_cvirt.h>
+
 #include <linux/vserver/switch.h>
 #include <linux/vserver/global.h>
 
diff --git a/kernel/vserver/signal.c b/kernel/vserver/signal.c
index 3eb2dc823..c56c75020 100644
--- a/kernel/vserver/signal.c
+++ b/kernel/vserver/signal.c
@@ -12,10 +12,10 @@
  */
 
 #include <linux/sched.h>
+
 #include <asm/errno.h>
 #include <asm/uaccess.h>
 
-#include <linux/vs_base.h>
 #include <linux/vs_context.h>
 #include <linux/vserver/signal_cmd.h>
 
-- 
2.43.0