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 37/59] sysctl: C99 convert arch/sh64/kernel/traps.c and remove ABI breakage.
    Date
    From: Eric W. Biederman <ebiederm@xmission.com> - unquoted

    While doing the C99 conversion I notices that the top level sh64
    directory was using the binary number for CTL_KERN. That is a
    no-no so I removed the support for the sysctl binary interface
    only leaving sysctl /proc support.

    At least the sysctl tables were placed at the end of
    the list so user space did not see this mistake.

    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    ---
    arch/sh64/kernel/traps.c | 49 +++++++++++++++++++++++++++++++++++----------
    1 files changed, 38 insertions(+), 11 deletions(-)

    diff --git a/arch/sh64/kernel/traps.c b/arch/sh64/kernel/traps.c
    index 224b7f5..02cca74 100644
    --- a/arch/sh64/kernel/traps.c
    +++ b/arch/sh64/kernel/traps.c
    @@ -910,25 +910,52 @@ static int misaligned_fixup(struct pt_regs *regs)
    }

    static ctl_table unaligned_table[] = {
    - {1, "kernel_reports", &kernel_mode_unaligned_fixup_count,
    - sizeof(int), 0644, NULL, &proc_dointvec},
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "kernel_reports",
    + .data = &kernel_mode_unaligned_fixup_count,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    + .proc_handler = &proc_dointvec
    + },
    #if defined(CONFIG_SH64_USER_MISALIGNED_FIXUP)
    - {2, "user_reports", &user_mode_unaligned_fixup_count,
    - sizeof(int), 0644, NULL, &proc_dointvec},
    - {3, "user_enable", &user_mode_unaligned_fixup_enable,
    - sizeof(int), 0644, NULL, &proc_dointvec},
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "user_reports",
    + .data = &user_mode_unaligned_fixup_count,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    + .proc_handler = &proc_dointvec
    + },
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "user_enable",
    + .data = &user_mode_unaligned_fixup_enable,
    + .maxlen = sizeof(int),
    + .mode = 0644,
    + .proc_handler = &proc_dointvec},
    #endif
    - {0}
    + {}
    };

    static ctl_table unaligned_root[] = {
    - {1, "unaligned_fixup", NULL, 0, 0555, unaligned_table},
    - {0}
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "unaligned_fixup",
    + .mode = 0555,
    + unaligned_table
    + },
    + {}
    };

    static ctl_table sh64_root[] = {
    - {1, "sh64", NULL, 0, 0555, unaligned_root},
    - {0}
    + {
    + .ctl_name = CTL_UNNUMBERED,
    + .procname = "sh64",
    + .mode = 0555,
    + .child = unaligned_root
    + },
    + {}
    };
    static struct ctl_table_header *sysctl_header;
    static int __init init_sysctl(void)
    --
    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.023 / U:89.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site