xfs-masters
[Top] [All Lists]

[xfs-masters] [PATCH 49/59] sysctl: Move init_irq_proc into init/main wh

To: "<Andrew Morton" <akpm@xxxxxxxx>
Subject: [xfs-masters] [PATCH 49/59] sysctl: Move init_irq_proc into init/main where it belongs
From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Date: Tue, 16 Jan 2007 09:39:54 -0700
Cc: <linux-kernel@xxxxxxxxxxxxxxx>, <containers@xxxxxxxxxxxxxx>, <netdev@xxxxxxxxxxxxxxx>, xfs-masters@xxxxxxxxxxx, xfs@xxxxxxxxxxx, linux-scsi@xxxxxxxxxxxxxxx, James.Bottomley@xxxxxxxxxxxx, minyard@xxxxxxx, openipmi-developer@xxxxxxxxxxxxxxxxxxxxx, <tony.luck@xxxxxxxxx>, linux-mips@xxxxxxxxxxxxxx, ralf@xxxxxxxxxxxxxx, schwidefsky@xxxxxxxxxx, heiko.carstens@xxxxxxxxxx, linux390@xxxxxxxxxx, linux-390@xxxxxxxxxxxxx, paulus@xxxxxxxxx, linuxppc-dev@xxxxxxxxxx, lethal@xxxxxxxxxxxx, linuxsh-shmedia-dev@xxxxxxxxxxxxxxxxxxxxx, <ak@xxxxxxx>, vojtech@xxxxxxx, clemens@xxxxxxxxxx, a.zummo@xxxxxxxxxxxx, rtc-linux@xxxxxxxxxxxxxxxx, linux-parport@xxxxxxxxxxxxxxxxxxx, andrea@xxxxxxx, tim@xxxxxxxxxxxx, philb@xxxxxxx, aharkes@xxxxxxxxxx, coda@xxxxxxxxxx, codalist@xxxxxxxxxxxxxxxxxxxxxxxx, aia21@xxxxxxxxxx, linux-ntfs-dev@xxxxxxxxxxxxxxxxxxxxx, mark.fasheh@xxxxxxxxxx, kurt.hackel@xxxxxxxxxx, "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
In-reply-to: <m1ac0jc4no.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
References: <m1ac0jc4no.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>
Reply-to: xfs-masters@xxxxxxxxxxx
Sender: xfs-masters-bounce@xxxxxxxxxxx
From: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> - unquoted

Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
---
 init/main.c     |    3 +++
 kernel/sysctl.c |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/init/main.c b/init/main.c
index 8b4a7d7..8af5c6e 100644
--- a/init/main.c
+++ b/init/main.c
@@ -691,6 +691,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 600b333..7420761 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1172,8 +1172,6 @@ static ctl_table dev_table[] = {
        { .ctl_name = 0 }
 };
 
-extern void init_irq_proc (void);
-
 static DEFINE_SPINLOCK(sysctl_lock);
 
 /* called under sysctl_lock */
@@ -1219,7 +1217,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
 }
 
-- 
1.4.4.1.g278f


<Prev in Thread] Current Thread [Next in Thread>