X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fvserver%2Finit.c;h=f7f69442c4f135383705886a494a7c1f69e18e31;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=8afd1fc6496fce5277e48ba78e9bde990c700505;hpb=b76fcd5f0c655b6e3e9bf534594357025421c66a;p=linux-2.6.git

diff --git a/kernel/vserver/init.c b/kernel/vserver/init.c
index 8afd1fc64..f7f69442c 100644
--- a/kernel/vserver/init.c
+++ b/kernel/vserver/init.c
@@ -3,16 +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/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 
@@ -24,7 +21,9 @@ static int __init init_vserver(void)
 {
 	int ret = 0;
 
+#ifdef	CONFIG_VSERVER_DEBUG
 	vserver_register_sysctl();
+#endif
 	return ret;
 }
 
@@ -32,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);