From: Eric W. Biederman <ebiederm@xmission.com>

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 init/main.c     |    3 +++
 kernel/sysctl.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -puN init/main.c~sysctl-move-init_irq_proc-into-init-main-where-it-belongs init/main.c
--- a/init/main.c~sysctl-move-init_irq_proc-into-init-main-where-it-belongs
+++ a/init/main.c
@@ -707,6 +707,9 @@ static void __init do_basic_setup(void)
 #ifdef CONFIG_SYSCTL
 	sysctl_init();
 #endif
+#ifdef CONFIG_PROC_FS
+	init_irq_proc();
+#endif
 
 	do_initcalls();
 }
diff -puN kernel/sysctl.c~sysctl-move-init_irq_proc-into-init-main-where-it-belongs kernel/sysctl.c
--- a/kernel/sysctl.c~sysctl-move-init_irq_proc-into-init-main-where-it-belongs
+++ a/kernel/sysctl.c
@@ -1214,8 +1214,6 @@ static ctl_table dev_table[] = {
 	{ .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1261,7 +1259,6 @@ void __init sysctl_init(void)
 {
 #ifdef CONFIG_PROC_SYSCTL
 	register_proc_table(root_table, proc_sys_root, &root_table_header);
-	init_irq_proc();
 #endif
 }
 
_