---

yaml --- r: 71064 b: refs/heads/master c: 982c37c h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · 973250a · 973250a
1 parent 143067d
commit 973250a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 107 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb0466c3ae7f1c73f70072af8fd27ac166908a2f
+refs/heads/master: 982c37cfb6e61c0e64634abc2e305d757c1405b2
diff --git a/trunk/include/net/9p/9p.h b/trunk/include/net/9p/9p.h
@@ -415,18 +415,4 @@ int p9_idpool_check(int id, struct p9_idpool *p);
 
 int p9_error_init(void);
 int p9_errstr2errno(char *, int);
-
-#ifdef CONFIG_SYSCTL
-int __init p9_sysctl_register(void);
-void __exit p9_sysctl_unregister(void);
-#else
-static inline int p9_sysctl_register(void)
-{
-	return 0;
-}
-static inline void p9_sysctl_unregister(void)
-{
-}
-#endif
-
 #endif /* NET_9P_H */
diff --git a/trunk/net/9p/Makefile b/trunk/net/9p/Makefile
@@ -10,7 +10,5 @@ obj-$(CONFIG_NET_9P_FD) += 9pnet_fd.o
 	fcprint.o \
 	util.o \
 
-9pnet-$(CONFIG_SYSCTL) += sysctl.o
-
 9pnet_fd-objs := \
 	trans_fd.o \
diff --git a/trunk/net/9p/mod.c b/trunk/net/9p/mod.c
@@ -41,8 +41,6 @@ MODULE_PARM_DESC(debug, "9P debugging level");
 
 extern int p9_mux_global_init(void);
 extern void p9_mux_global_exit(void);
-extern int p9_sysctl_register(void);
-extern void p9_sysctl_unregister(void);
 
 /*
  * Dynamic Transport Registration Routines
@@ -118,12 +116,6 @@ static int __init init_p9(void)
 		return ret;
 	}
 
-	ret = p9_sysctl_register();
-	if (ret) {
-		printk(KERN_WARNING "9p: registering sysctl failed\n");
-		return ret;
-	}
-
 	return ret;
 }
 
@@ -134,7 +126,6 @@ static int __init init_p9(void)
 
 static void __exit exit_p9(void)
 {
-	p9_sysctl_unregister();
 	p9_mux_global_exit();
 }
 

diff --git a/trunk/net/9p/sysctl.c b/trunk/net/9p/sysctl.c