commit b04c3afb2b6e2f902b41bb62b73684d92d7e6c34
author Eric W. Biederman <ebiederm@xmission.com> Wed Feb 14 00:33:57 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Feb 14 08:09:58 2007 -0800
tree 00b164435ec9c9226659852c784e7e0a8c94c8e9
parent 0e03036c97b70b2602f7dedaa3a223ed7563c2c9

[PATCH] sysctl: move init_irq_proc into init/main where it belongs

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>

init/main.c

diff --git a/init/main.c b/init/main.c
index 4e9e92b..a20a513 100644
--- a/init/main.c
+++ b/init/main.c
@@ -705,6 +705,9 @@
 #ifdef CONFIG_SYSCTL
 	sysctl_init();
 #endif
+#ifdef CONFIG_PROC_FS
+	init_irq_proc();
+#endif
 
 	do_initcalls();
 }

kernel/sysctl.c

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e0ac6cd..7ba4b0c 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1177,8 +1177,6 @@
 	{ .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1224,7 +1222,6 @@
 {
 #ifdef CONFIG_PROC_SYSCTL
 	register_proc_table(root_table, proc_sys_root, &root_table_header);
-	init_irq_proc();
 #endif
 }