[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>

diff --git a/init/main.c b/init/main.c
index 4e9e92bb2b89623507e1c145a6c9a275da7686a6..a20a5138211f8146a3854e750a55c6f14dd487d4 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -705,6 +705,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 --git a/kernel/sysctl.c b/kernel/sysctl.c
index e0ac6cd79fcf6955c6105815b4c8ab4d9d53e97f..7ba4b0c16d6a324091e4bcf103dd072d062f086c 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
        { .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1224,7 +1222,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
 }