From d4416ff7482193756914f0c6f95947846c8c058f Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Wed, 14 Feb 2007 00:34:07 -0800
Subject: [PATCH] --- yaml --- r: 48383 b: refs/heads/master c:
 2abc26fc6b6f60fc70d6957b842ef4e5f805df7b h: refs/heads/master i:   48381:
 74156c8556481cfcd8d94bb623196284f8cdcecf   48379:
 4f69a99bc1ac4b1eb1f33ecfe4c963e34a0039e1   48375:
 4a17b40d09095ced9528de36492b03e0d73b512a   48367:
 6d0633b2cedc2f73c3e500a357718a192ac9013e   48351:
 b474eb8b920b900b0bc8ce2123b15649285d4477   48319:
 5c3f9e5a25cbd86beaaf4030327f7f742b663e7a   48255:
 1eecad78d5c7bf2cef1bf84090fa6656191315d2   48127:
 80eb31872ad90c411d664366df8321d3b7a1669e v: v3

---
 [refs]                |  2 +-
 trunk/fs/proc/root.c  |  4 ----
 trunk/kernel/sysctl.c | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 048d92d6b70b..4bae0f6b31f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5494dcd8b92dce64317f2f7dd0d62747c54980b
+refs/heads/master: 2abc26fc6b6f60fc70d6957b842ef4e5f805df7b
diff --git a/trunk/fs/proc/root.c b/trunk/fs/proc/root.c
index af154458b540..6ae222b509ce 100644
--- a/trunk/fs/proc/root.c
+++ b/trunk/fs/proc/root.c
@@ -73,10 +73,6 @@ void __init proc_root_init(void)
 #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);
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index ca376e733ce4..fc2ce3d8f97e 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/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 }
 };