4 files changed, 0 insertions, 106 deletions

diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 7a448a30e39b..686425a97b0f 100644
--- a/include/net/9p/9p.h
+++ b/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/net/9p/Makefile b/net/9p/Makefile
index 7b2a67abc0a0..5059bc06f8f3 100644
--- a/net/9p/Makefile
+++ b/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/net/9p/mod.c b/net/9p/mod.c
index b8ac0635ad83..41d70f47375d 100644
--- a/net/9p/mod.c
+++ b/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/net/9p/sysctl.c b/net/9p/sysctl.c
deleted file mode 100644
index 8b61027a24ea..000000000000
--- a/net/9p/sysctl.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- *  net/9p/sysctl.c
- *
- *  9P sysctl interface
- *
- *  Copyright (C) 2007 by Latchesar Ionkov <lucho@ionkov.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to:
- *  Free Software Foundation
- *  51 Franklin Street, Fifth Floor
- *  Boston, MA  02111-1301  USA
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sysctl.h>
-#include <linux/init.h>
-#include <net/9p/9p.h>
-
-static struct ctl_table p9_table[] = {
-#ifdef CONFIG_NET_9P_DEBUG
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "debug",
-                .data           = &p9_debug_level,
-                .maxlen         = sizeof(int),
-                .mode           = 0644,
-                .proc_handler   = &proc_dointvec
-        },
-#endif
-        {},
-};
-
-static struct ctl_table p9_net_table[] = {
-        {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "9p",
-                .maxlen         = 0,
-                .mode           = 0555,
-                .child          = p9_table,
-        },
-        {},
-};
-
-static struct ctl_table p9_ctl_table[] = {
-        {
-                .ctl_name       = CTL_NET,
-                .procname       = "net",
-                .maxlen         = 0,
-                .mode           = 0555,
-                .child          = p9_net_table,
-        },
-        {},
-};
-
-static struct ctl_table_header *p9_table_header;
-
-int __init p9_sysctl_register(void)
-{
-        p9_table_header = register_sysctl_table(p9_ctl_table);
-        if (!p9_table_header)
-                return -ENOMEM;
-
-        return 0;
-}
-
-void __exit p9_sysctl_unregister(void)
-{
-         unregister_sysctl_table(p9_table_header);
-}