aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/main.c3
-rw-r--r--kernel/sysctl.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 4e9e92bb2b89..a20a5138211f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -705,6 +705,9 @@ static void __init do_basic_setup(void)
705#ifdef CONFIG_SYSCTL 705#ifdef CONFIG_SYSCTL
706 sysctl_init(); 706 sysctl_init();
707#endif 707#endif
708#ifdef CONFIG_PROC_FS
709 init_irq_proc();
710#endif
708 711
709 do_initcalls(); 712 do_initcalls();
710} 713}
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index e0ac6cd79fcf..7ba4b0c16d6a 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
1177 { .ctl_name = 0 } 1177 { .ctl_name = 0 }
1178}; 1178};
1179 1179
1180extern void init_irq_proc (void);
1181
1182static DEFINE_SPINLOCK(sysctl_lock); 1180static DEFINE_SPINLOCK(sysctl_lock);
1183 1181
1184/* called under sysctl_lock */ 1182/* called under sysctl_lock */
@@ -1224,7 +1222,6 @@ void __init sysctl_init(void)
1224{ 1222{
1225#ifdef CONFIG_PROC_SYSCTL 1223#ifdef CONFIG_PROC_SYSCTL
1226 register_proc_table(root_table, proc_sys_root, &root_table_header); 1224 register_proc_table(root_table, proc_sys_root, &root_table_header);
1227 init_irq_proc();
1228#endif 1225#endif
1229} 1226}
1230 1227