diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2009-04-03 08:11:21 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2009-11-12 05:05:04 -0500 |
commit | 50469619999a0bc2ba8fa1365dc443b7aed190af (patch) | |
tree | 7ff6bf25c65e0fe8124a75c9cb817cc3e71f5bda /arch/arm/mach-bcmring | |
parent | 24a065624dcdd91e8bfd0f14113feb91c7ed11ca (diff) |
sysctl arm: Remove binary sysctl support
Now that sys_sysctl is a generic wrapper around /proc/sys .ctl_name
and .strategy members of sysctl tables are dead code. Remove them.
Remove a smattering of ctl_names used in sysctl paths,
and kill the ctl_names in the recently added mach-bcmring.
mach-bcmring never should have had sysctl entries with
.ctl_name set. The binary sysctl interface has been frozen
for a long time before that code was merged, to prevent
probmes with conflicts and lack of testing. The sysctl_check
code would have caught this if anyone had ever tested it that way.
So I have simply dropped the binary sysctl support instead of
adding another compat entry into sysctl_binary.c. Going through
/proc/sys/reboot/warm will still work.
Cc: Leo Chen <leochen@broadcom.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'arch/arm/mach-bcmring')
-rw-r--r-- | arch/arm/mach-bcmring/arch.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c index 0da693b0f7e1..f3c11199707a 100644 --- a/arch/arm/mach-bcmring/arch.c +++ b/arch/arm/mach-bcmring/arch.c | |||
@@ -47,10 +47,6 @@ HW_DECLARE_SPINLOCK(gpio) | |||
47 | EXPORT_SYMBOL(bcmring_gpio_reg_lock); | 47 | EXPORT_SYMBOL(bcmring_gpio_reg_lock); |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | /* FIXME: temporary solution */ | ||
51 | #define BCM_SYSCTL_REBOOT_WARM 1 | ||
52 | #define CTL_BCM_REBOOT 112 | ||
53 | |||
54 | /* sysctl */ | 50 | /* sysctl */ |
55 | int bcmring_arch_warm_reboot; /* do a warm reboot on hard reset */ | 51 | int bcmring_arch_warm_reboot; /* do a warm reboot on hard reset */ |
56 | 52 | ||
@@ -58,7 +54,6 @@ static struct ctl_table_header *bcmring_sysctl_header; | |||
58 | 54 | ||
59 | static struct ctl_table bcmring_sysctl_warm_reboot[] = { | 55 | static struct ctl_table bcmring_sysctl_warm_reboot[] = { |
60 | { | 56 | { |
61 | .ctl_name = BCM_SYSCTL_REBOOT_WARM, | ||
62 | .procname = "warm", | 57 | .procname = "warm", |
63 | .data = &bcmring_arch_warm_reboot, | 58 | .data = &bcmring_arch_warm_reboot, |
64 | .maxlen = sizeof(int), | 59 | .maxlen = sizeof(int), |
@@ -69,7 +64,6 @@ static struct ctl_table bcmring_sysctl_warm_reboot[] = { | |||
69 | 64 | ||
70 | static struct ctl_table bcmring_sysctl_reboot[] = { | 65 | static struct ctl_table bcmring_sysctl_reboot[] = { |
71 | { | 66 | { |
72 | .ctl_name = CTL_BCM_REBOOT, | ||
73 | .procname = "reboot", | 67 | .procname = "reboot", |
74 | .mode = 0555, | 68 | .mode = 0555, |
75 | .child = bcmring_sysctl_warm_reboot}, | 69 | .child = bcmring_sysctl_warm_reboot}, |