[PATCH] sysctl: sn: remove sysctl ABI BREAKAGE

By not using the enumeration in sysctl.h (or even understanding it) the SN
platform placed their arch specific xpc directory on top of CTL_KERN and only
because they didn't have 4 entries in their xpc directory got lucky and didn't
break glibc.

This is totally irresponsible.  So this patch entirely removes sys_sysctl
support from their sysctl code.  Hopefully they don't have ascii name
conflicts as well.

And now that they have no ABI numbers add them to the end instead of the
sysctl list instead of the head so nothing else will be overridden.

Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index 7a387d2373637a7ba9801f0691820674680ae24f..24adb7566e8be59886bd246adc75b6e705c7a094 100644 (file)
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -101,7 +101,7 @@ static int xpc_disengage_request_max_timelimit = 120;
 
 static ctl_table xpc_sys_xpc_hb_dir[] = {
        {
-               1,
+               CTL_UNNUMBERED,
                "hb_interval",
                &xpc_hb_interval,
                sizeof(int),
@@ -114,7 +114,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
                &xpc_hb_max_interval
        },
        {
-               2,
+               CTL_UNNUMBERED,
                "hb_check_interval",
                &xpc_hb_check_interval,
                sizeof(int),
@@ -130,7 +130,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
 };
 static ctl_table xpc_sys_xpc_dir[] = {
        {
-               1,
+               CTL_UNNUMBERED,
                "hb",
                NULL,
                0,
@@ -138,7 +138,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
                xpc_sys_xpc_hb_dir
        },
        {
-               2,
+               CTL_UNNUMBERED,
                "disengage_request_timelimit",
                &xpc_disengage_request_timelimit,
                sizeof(int),
@@ -154,7 +154,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
 };
 static ctl_table xpc_sys_dir[] = {
        {
-               1,
+               CTL_UNNUMBERED,
                "xpc",
                NULL,
                0,
@@ -1251,7 +1251,7 @@ xpc_init(void)
        snprintf(xpc_part->bus_id, BUS_ID_SIZE, "part");
        snprintf(xpc_chan->bus_id, BUS_ID_SIZE, "chan");
 
-       xpc_sysctl = register_sysctl_table(xpc_sys_dir, 1);
+       xpc_sysctl = register_sysctl_table(xpc_sys_dir, 0);
 
        /*
         * The first few fields of each entry of xpc_partitions[] need to