Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/kernel/vserver/init.c b/kernel/vserver/init.c
index 8afd1fc..f41b93b 100644 (file)
--- 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-2005  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,7 +31,9 @@ static int __init init_vserver(void)
 static void __exit exit_vserver(void)
 {
 
+#ifdef CONFIG_VSERVER_DEBUG
        vserver_unregister_sysctl();
+#endif
        return;
 }