Skip to content

Commit b04c3af

Browse files
ebiedermLinus Torvalds
authored andcommitted
[PATCH] sysctl: move init_irq_proc into init/main where it belongs
Signed-off-by: Eric W. Biederman <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 0e03036 commit b04c3af

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

init/main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,9 @@ static void __init do_basic_setup(void)
705705
#ifdef CONFIG_SYSCTL
706706
sysctl_init();
707707
#endif
708+
#ifdef CONFIG_PROC_FS
709+
init_irq_proc();
710+
#endif
708711

709712
do_initcalls();
710713
}

kernel/sysctl.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,8 +1177,6 @@ static ctl_table dev_table[] = {
11771177
{ .ctl_name = 0 }
11781178
};
11791179

1180-
extern void init_irq_proc (void);
1181-
11821180
static DEFINE_SPINLOCK(sysctl_lock);
11831181

11841182
/* called under sysctl_lock */
@@ -1224,7 +1222,6 @@ void __init sysctl_init(void)
12241222
{
12251223
#ifdef CONFIG_PROC_SYSCTL
12261224
register_proc_table(root_table, proc_sys_root, &root_table_header);
1227-
init_irq_proc();
12281225
#endif
12291226
}
12301227

0 commit comments

Comments
 (0)