diff options
-rw-r--r-- | fs/proc/root.c | 4 | ||||
-rw-r--r-- | kernel/sysctl.c | 14 |
2 files changed, 14 insertions, 4 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index af154458b540..6ae222b509ce 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -74,10 +74,6 @@ void __init proc_root_init(void) #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); proc_mkdir("fs/nfsd", NULL); /* somewhere for the nfsd filesystem to be mounted */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c index ca376e733ce4..fc2ce3d8f97e 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -881,6 +881,12 @@ static ctl_table vm_table[] = { { .ctl_name = 0 } }; +#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) +static ctl_table binfmt_misc_table[] = { + { .ctl_name = 0 } +}; +#endif + static ctl_table fs_table[] = { { .ctl_name = FS_NRINODE, @@ -1004,6 +1010,14 @@ static ctl_table fs_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, +#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE) + { + .ctl_name = CTL_UNNUMBERED, + .procname = "binfmt_misc", + .mode = 0555, + .child = binfmt_misc_table, + }, +#endif { .ctl_name = 0 } }; |