summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-02-14 00:33:57 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-14 08:09:58 -0800
commitb04c3afb2b6e2f902b41bb62b73684d92d7e6c34 (patch)
tree00b164435ec9c9226659852c784e7e0a8c94c8e9
parent0e03036c97b70b2602f7dedaa3a223ed7563c2c9 (diff)
[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>
-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)
#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 e0ac6cd79fcf..7ba4b0c16d6a 100644
--- 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
}