lkml.org 
[lkml]   [2009]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 18/23] sysctl ia64: Remove dead binary sysctl support
    Date
    From: Eric W. Biederman <ebiederm@xmission.com>

    Now that sys_sysctl is a generic wrapper around /proc/sys .ctl_name
    and .strategy members of sysctl tables are dead code. Remove them.

    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    arch/ia64/kernel/crash.c | 7 ++-----
    arch/ia64/kernel/perfmon.c | 6 ------
    drivers/misc/sgi-xp/xpc_main.c | 8 --------
    3 files changed, 2 insertions(+), 19 deletions(-)
    diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
    index 6631a9d..7c7d6a6 100644
    --- a/arch/ia64/kernel/crash.c
    +++ b/arch/ia64/kernel/crash.c
    @@ -239,7 +239,6 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
    #ifdef CONFIG_SYSCTL
    static ctl_table kdump_ctl_table[] = {
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "kdump_on_init",
    .data = &kdump_on_init,
    .maxlen = sizeof(int),
    @@ -247,24 +246,22 @@ static ctl_table kdump_ctl_table[] = {
    .proc_handler = &proc_dointvec,
    },
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "kdump_on_fatal_mca",
    .data = &kdump_on_fatal_mca,
    .maxlen = sizeof(int),
    .mode = 0644,
    .proc_handler = &proc_dointvec,
    },
    - { .ctl_name = 0 }
    + { }
    };

    static ctl_table sys_table[] = {
    {
    - .ctl_name = CTL_KERN,
    .procname = "kernel",
    .mode = 0555,
    .child = kdump_ctl_table,
    },
    - { .ctl_name = 0 }
    + { }
    };
    #endif

    diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
    index f178270..ca30b36 100644
    --- a/arch/ia64/kernel/perfmon.c
    +++ b/arch/ia64/kernel/perfmon.c
    @@ -522,7 +522,6 @@ EXPORT_SYMBOL(pfm_sysctl);

    static ctl_table pfm_ctl_table[]={
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "debug",
    .data = &pfm_sysctl.debug,
    .maxlen = sizeof(int),
    @@ -530,7 +529,6 @@ static ctl_table pfm_ctl_table[]={
    .proc_handler = &proc_dointvec,
    },
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "debug_ovfl",
    .data = &pfm_sysctl.debug_ovfl,
    .maxlen = sizeof(int),
    @@ -538,7 +536,6 @@ static ctl_table pfm_ctl_table[]={
    .proc_handler = &proc_dointvec,
    },
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "fastctxsw",
    .data = &pfm_sysctl.fastctxsw,
    .maxlen = sizeof(int),
    @@ -546,7 +543,6 @@ static ctl_table pfm_ctl_table[]={
    .proc_handler = &proc_dointvec,
    },
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "expert_mode",
    .data = &pfm_sysctl.expert_mode,
    .maxlen = sizeof(int),
    @@ -557,7 +553,6 @@ static ctl_table pfm_ctl_table[]={
    };
    static ctl_table pfm_sysctl_dir[] = {
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "perfmon",
    .mode = 0555,
    .child = pfm_ctl_table,
    @@ -566,7 +561,6 @@ static ctl_table pfm_sysctl_dir[] = {
    };
    static ctl_table pfm_sysctl_root[] = {
    {
    - .ctl_name = CTL_KERN,
    .procname = "kernel",
    .mode = 0555,
    .child = pfm_sysctl_dir,
    diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
    index fd3688a..ce98b93 100644
    --- a/drivers/misc/sgi-xp/xpc_main.c
    +++ b/drivers/misc/sgi-xp/xpc_main.c
    @@ -89,48 +89,40 @@ static int xpc_disengage_max_timelimit = 120;

    static ctl_table xpc_sys_xpc_hb_dir[] = {
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "hb_interval",
    .data = &xpc_hb_interval,
    .maxlen = sizeof(int),
    .mode = 0644,
    .proc_handler = &proc_dointvec_minmax,
    - .strategy = &sysctl_intvec,
    .extra1 = &xpc_hb_min_interval,
    .extra2 = &xpc_hb_max_interval},
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "hb_check_interval",
    .data = &xpc_hb_check_interval,
    .maxlen = sizeof(int),
    .mode = 0644,
    .proc_handler = &proc_dointvec_minmax,
    - .strategy = &sysctl_intvec,
    .extra1 = &xpc_hb_check_min_interval,
    .extra2 = &xpc_hb_check_max_interval},
    {}
    };
    static ctl_table xpc_sys_xpc_dir[] = {
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "hb",
    .mode = 0555,
    .child = xpc_sys_xpc_hb_dir},
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "disengage_timelimit",
    .data = &xpc_disengage_timelimit,
    .maxlen = sizeof(int),
    .mode = 0644,
    .proc_handler = &proc_dointvec_minmax,
    - .strategy = &sysctl_intvec,
    .extra1 = &xpc_disengage_min_timelimit,
    .extra2 = &xpc_disengage_max_timelimit},
    {}
    };
    static ctl_table xpc_sys_dir[] = {
    {
    - .ctl_name = CTL_UNNUMBERED,
    .procname = "xpc",
    .mode = 0555,
    .child = xpc_sys_xpc_dir},
    --
    1.6.5.2.143.g8cc62


    \
     
     \ /
      Last update: 2009-11-08 13:55    [from the cache]
    ©2003-2011 Jasper Spaans. Advertise on this site