lkml.org 
[lkml]   [2007]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 49/59] sysctl: Move init_irq_proc into init/main where it belongs
    Date
    From: Eric W. Biederman <ebiederm@xmission.com> - unquoted

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-01-16 19:07    [W:0.031 / U:1.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site