linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / kernel / vserver / switch.c

diff --git a/kernel/vserver/switch.c b/kernel/vserver/switch.c
index ce383a4..6bfcfca 100644 (file)
--- a/kernel/vserver/switch.c
+++ b/kernel/vserver/switch.c
@@ -19,6 +19,7 @@
 #include <linux/compat.h>
 #include <asm/errno.h>
 
+#include <linux/vs_base.h>
 #include <linux/vserver/network.h>
 #include <linux/vserver/switch.h>
 #include <linux/vserver/debug.h>
@@ -111,8 +112,6 @@ long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
                return vc_set_namespace(-1, data);
        case VCMD_set_namespace:
                return vc_set_namespace(id, data);
-       case VCMD_cleanup_namespace:
-               return vc_cleanup_namespace(id, data);
        }
 
        /* those are allowed while in setup too */
@@ -241,7 +240,7 @@ long do_vserver(uint32_t cmd, uint32_t id, void __user *data, int compat)
        return -ENOSYS;
 }
 
-extern asmlinkage long
+asmlinkage long
 sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
 {
        long ret = do_vserver(cmd, id, data, 0);
@@ -255,7 +254,7 @@ sys_vserver(uint32_t cmd, uint32_t id, void __user *data)
 
 #ifdef CONFIG_COMPAT
 
-extern asmlinkage long
+asmlinkage long
 sys32_vserver(uint32_t cmd, uint32_t id, void __user *data)
 {
        long ret = do_vserver(cmd, id, data, 1);