xfs-masters
[Top] [All Lists]

[xfs-masters] [PATCH 37/59] sysctl: C99 convert arch/sh64/kernel/traps.c

To: "<Andrew Morton" <akpm@xxxxxxxx>
Subject: [xfs-masters] [PATCH 37/59] sysctl: C99 convert arch/sh64/kernel/traps.c and remove ABI breakage.
From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx>
Date: Tue, 16 Jan 2007 09:39:42 -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

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@xxxxxxxxxxxx>
---
 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


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