aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 03:34:07 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 11:09:59 -0500
commit2abc26fc6b6f60fc70d6957b842ef4e5f805df7b (patch)
tree017fc02dbd50a401970f6b92224be177a85cda43 /kernel
parenta5494dcd8b92dce64317f2f7dd0d62747c54980b (diff)
[PATCH] sysctl: create sys/fs/binfmt_misc as an ordinary sysctl entry
binfmt_misc has a mount point in the middle of the sysctl and that mount point is created as a proc_generic directory. Doing it that way gets in the way of cleaning up the sysctl proc support as it continues the existence of a horrible hack. So instead simply create the directory as an ordinary sysctl directory. At least that removes the magic special case. [akpm@osdl.org: warning fix] Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sysctl.c14
1 files changed, 14 insertions, 0 deletions
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[] = {
881 { .ctl_name = 0 } 881 { .ctl_name = 0 }
882}; 882};
883 883
884#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
885static ctl_table binfmt_misc_table[] = {
886 { .ctl_name = 0 }
887};
888#endif
889
884static ctl_table fs_table[] = { 890static ctl_table fs_table[] = {
885 { 891 {
886 .ctl_name = FS_NRINODE, 892 .ctl_name = FS_NRINODE,
@@ -1004,6 +1010,14 @@ static ctl_table fs_table[] = {
1004 .mode = 0644, 1010 .mode = 0644,
1005 .proc_handler = &proc_dointvec, 1011 .proc_handler = &proc_dointvec,
1006 }, 1012 },
1013#if defined(CONFIG_BINFMT_MISC) || defined(CONFIG_BINFMT_MISC_MODULE)
1014 {
1015 .ctl_name = CTL_UNNUMBERED,
1016 .procname = "binfmt_misc",
1017 .mode = 0555,
1018 .child = binfmt_misc_table,
1019 },
1020#endif
1007 { .ctl_name = 0 } 1021 { .ctl_name = 0 }
1008}; 1022};
1009 1023