fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/kernel/vserver/init.c b/kernel/vserver/init.c
index 4a20f26..f7f6944 100644 (file)
--- a/kernel/vserver/init.c
+++ b/kernel/vserver/init.c
@@ -3,15 +3,13 @@
  *
  *  Virtual Server Init
  *
- *  Copyright (C) 2004  Herbert Pötzl
+ *  Copyright (C) 2004-2007  Herbert Pötzl
  *
  *  V0.01  basic structure
  *
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
-#include <linux/vserver.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -23,7 +21,9 @@ static int __init init_vserver(void)
 {
        int ret = 0;
 
+#ifdef CONFIG_VSERVER_DEBUG
        vserver_register_sysctl();
+#endif
        return ret;
 }
 
@@ -31,10 +31,16 @@ static int __init init_vserver(void)
 static void __exit exit_vserver(void)
 {
 
+#ifdef CONFIG_VSERVER_DEBUG
        vserver_unregister_sysctl();
+#endif
        return;
 }
 
+/* FIXME: GFP_ZONETYPES gone
+long vx_slab[GFP_ZONETYPES]; */
+long vx_area;
+
 
 module_init(init_vserver);
 module_exit(exit_vserver);