X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2Fproc%2Froot.c;h=41f17037f73890ad5551651bc776446c3798ac68;hb=9d0633cfedde484d30eef869f749c04709ab3e42;hp=af154458b540ccf6f4d89741b037523ef4f87f08;hpb=9468482bd4c3b89abe04a770848d5eaa1ea830b0;p=powerpc.git

diff --git a/fs/proc/root.c b/fs/proc/root.c
index af154458b5..41f17037f7 100644
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
@@ -23,10 +23,6 @@
 
 struct proc_dir_entry *proc_net, *proc_net_stat, *proc_bus, *proc_root_fs, *proc_root_driver;
 
-#ifdef CONFIG_SYSCTL
-struct proc_dir_entry *proc_sys_root;
-#endif
-
 static int proc_get_sb(struct file_system_type *fs_type,
 	int flags, const char *dev_name, void *data, struct vfsmount *mnt)
 {
@@ -70,13 +66,6 @@ void __init proc_root_init(void)
 
 #ifdef CONFIG_SYSVIPC
 	proc_mkdir("sysvipc", NULL);
-#endif
-#ifdef CONFIG_SYSCTL
-	proc_sys_root = proc_mkdir("sys", NULL);
-#endif
-#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
-	proc_mkdir("sys/fs", NULL);
-	proc_mkdir("sys/fs/binfmt_misc", NULL);
 #endif
 	proc_root_fs = proc_mkdir("fs", NULL);
 	proc_root_driver = proc_mkdir("driver", NULL);
@@ -90,6 +79,7 @@ void __init proc_root_init(void)
 	proc_device_tree_init();
 #endif
 	proc_bus = proc_mkdir("bus", NULL);
+	proc_sys_init();
 }
 
 static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat