sysctl: Remove the sysctl system call
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 1 Oct 2019 18:01:19 +0000 (13:01 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Nov 2019 19:03:56 +0000 (13:03 -0600)
This system call has been deprecated almost since it was introduced, and
in a survey of the linux distributions I can no longer find any of them
that enable CONFIG_SYSCTL_SYSCALL.  The only indication that I can find
that anyone might care is that a few of the defconfigs in the kernel
enable CONFIG_SYSCTL_SYSCALL.  However this appears in only 31 of 414
defconfigs in the kernel, so I suspect this symbols presence is simply
because it is harmless to include rather than because it is necessary.

As there appear to be no users of the sysctl system call, remove the
code.  As this removes one of the few uses of the internal kernel mount
of proc I hope this allows for even more simplifications of the proc
filesystem.

Cc: Alex Smith <alex.smith@imgtec.com>
Cc: Anders Berg <anders.berg@lsi.com>
Cc: Apelete Seketeli <apelete@seketeli.net>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Chee Nouk Phoon <cnphoon@altera.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Christian Ruppert <christian.ruppert@abilis.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Harvey Hunt <harvey.hunt@imgtec.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Hongliang Tao <taohl@lemote.com>
Cc: Hua Yan <yanh@lemote.com>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: Josh Boyer <jwboyer@gmail.com>
Cc: Jun Nie <jun.nie@linaro.org>
Cc: Kevin Hilman <khilman@linaro.org>
Cc: Kevin Wells <kevin.wells@nxp.com>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Noam Camus <noamc@ezchip.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Phil Edworthy <phil.edworthy@renesas.com>
Cc: Pierrick Hascoet <pierrick.hascoet@abilis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Roland Stigge <stigge@antcom.de>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Scott Telford <stelford@cadence.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Andi Kleen <ak@linux.intel.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
34 files changed:
arch/arc/configs/nps_defconfig
arch/arc/configs/tb10x_defconfig
arch/arm/configs/axm55xx_defconfig
arch/arm/configs/keystone_defconfig
arch/arm/configs/lpc32xx_defconfig
arch/arm/configs/moxart_defconfig
arch/arm/configs/qcom_defconfig
arch/arm/configs/zx_defconfig
arch/m68k/configs/m5475evb_defconfig
arch/mips/configs/ci20_defconfig
arch/mips/configs/loongson3_defconfig
arch/mips/configs/malta_qemu_32r6_defconfig
arch/mips/configs/maltaaprp_defconfig
arch/mips/configs/maltasmvp_defconfig
arch/mips/configs/maltasmvp_eva_defconfig
arch/mips/configs/maltaup_defconfig
arch/mips/configs/omega2p_defconfig
arch/mips/configs/qi_lb60_defconfig
arch/mips/configs/vocore2_defconfig
arch/nios2/configs/10m50_defconfig
arch/nios2/configs/3c120_defconfig
arch/parisc/configs/c8000_defconfig
arch/parisc/configs/generic-32bit_defconfig
arch/powerpc/configs/40x/klondike_defconfig
arch/sh/configs/rsk7264_defconfig
arch/xtensa/configs/audio_kc705_defconfig
arch/xtensa/configs/cadence_csp_defconfig
arch/xtensa/configs/generic_kc705_defconfig
arch/xtensa/configs/iss_defconfig
arch/xtensa/configs/nommu_kc705_defconfig
arch/xtensa/configs/smp_lx200_defconfig
arch/xtensa/configs/virt_defconfig
init/Kconfig
kernel/sysctl_binary.c

index 5978d4d..07f26ed 100644 (file)
@@ -7,7 +7,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_EPOLL is not set
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set
index 3a138f8..a12656e 100644 (file)
@@ -15,7 +15,6 @@ CONFIG_INITRAMFS_ROOT_UID=2100
 CONFIG_INITRAMFS_ROOT_GID=501
 # CONFIG_RD_GZIP is not set
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_AIO is not set
 CONFIG_EMBEDDED=y
index 31bfe16..f53634a 100644 (file)
@@ -20,7 +20,6 @@ CONFIG_NAMESPACES=y
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
index 3d5f5b5..f33f5d7 100644 (file)
@@ -11,7 +11,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_BASE_FULL is not set
index 09deb57..989bcc8 100644 (file)
@@ -9,7 +9,6 @@ CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 # CONFIG_ARCH_MULTI_V7 is not set
index 9b98761..45d2719 100644 (file)
@@ -4,7 +4,6 @@ CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_SIGNALFD is not set
index 02f1e7b..67c306f 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_CGROUPS=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_SLUB_DEBUG is not set
index c4070c1..4d2ef78 100644 (file)
@@ -11,7 +11,6 @@ CONFIG_RT_GROUP_SCHED=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
index 434bd37..579fd98 100644 (file)
@@ -1,6 +1,5 @@
 # CONFIG_SWAP is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_KALLSYMS is not set
 # CONFIG_FUTEX is not set
 # CONFIG_EPOLL is not set
index cb4aa23..be41df2 100644 (file)
@@ -17,7 +17,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
index 90ee008..409dc9a 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_MACH_LOONGSON64=y
 CONFIG_LOONGSON_MACH3X=y
index e6c600d..614af02 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MIPS_MALTA=y
index 82b44b7..9c051f8 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_AUDIT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MIPS_MALTA=y
index 4190fc6..2e90d97 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MIPS_MALTA=y
index a13c10e..d1f7fdb 100644 (file)
@@ -5,7 +5,6 @@ CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MIPS_MALTA=y
index b35f1fc..48e5bd4 100644 (file)
@@ -6,7 +6,6 @@ CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MIPS_MALTA=y
index a39426e..fc39ddf 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
index d3f4d52..97c9a69 100644 (file)
@@ -2,7 +2,6 @@
 CONFIG_SYSVIPC=y
 # CONFIG_CROSS_MEMORY_ATTACH is not set
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
index 523b944..a14f8ea 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_CGROUP_CPUACCT=y
 CONFIG_NAMESPACES=y
 CONFIG_USER_NS=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
index 1137ef2..a7967b4 100644 (file)
@@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_EPOLL is not set
 # CONFIG_SIGNALFD is not set
index a0f160b..423a0c4 100644 (file)
@@ -2,7 +2,6 @@ CONFIG_SYSVIPC=y
 CONFIG_NO_HZ_IDLE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_ELF_CORE is not set
 # CONFIG_EPOLL is not set
 # CONFIG_SIGNALFD is not set
index 507f064..db864b1 100644 (file)
@@ -9,7 +9,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
index 18b072a..c7a5726 100644 (file)
@@ -8,7 +8,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
index 4347a87..579fa84 100644 (file)
@@ -4,7 +4,6 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
index 2b0572b..7864319 100644 (file)
@@ -8,7 +8,6 @@ CONFIG_NAMESPACES=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_COUNTERS=y
index f378e56..b6367af 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
index 62f32a9..f4eef6d 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_INITRAMFS_SOURCE="$$KERNEL_INITRAMFS_SOURCE"
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PROFILING=y
 CONFIG_MODULES=y
index 8bebe07..c925165 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
index 4bb5b76..d1c0174 100644 (file)
@@ -1,7 +1,6 @@
 CONFIG_SYSVIPC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 # CONFIG_PCI is not set
index 933ab2a..380e366 100644 (file)
@@ -21,7 +21,6 @@ CONFIG_BLK_DEV_INITRD=y
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
 CONFIG_MODULES=y
index e29c5b1..d46b58f 100644 (file)
@@ -16,7 +16,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
index bfc45a1..4fddd85 100644 (file)
@@ -15,7 +15,6 @@ CONFIG_SCHED_AUTOGROUP=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
-CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_PERF_EVENTS=y
 CONFIG_XTENSA_VARIANT_DC233C=y
index b4daad2..a408116 100644 (file)
@@ -1372,23 +1372,6 @@ config SYSFS_SYSCALL
 
          If unsure say Y here.
 
-config SYSCTL_SYSCALL
-       bool "Sysctl syscall support" if EXPERT
-       depends on PROC_SYSCTL
-       default n
-       select SYSCTL
-       ---help---
-         sys_sysctl uses binary paths that have been found challenging
-         to properly maintain and use.  The interface in /proc/sys
-         using paths with ascii names is now the primary path to this
-         information.
-
-         Almost nothing using the binary sysctl interface so if you are
-         trying to save some space it is probably safe to disable this,
-         making your kernel marginally smaller.
-
-         If unsure say N here.
-
 config FHANDLE
        bool "open by fhandle syscalls" if EXPERT
        select EXPORTFS
index 73c1320..7d550cc 100644 (file)
 #include <linux/slab.h>
 #include <linux/compat.h>
 
-#ifdef CONFIG_SYSCTL_SYSCALL
-
-struct bin_table;
-typedef ssize_t bin_convert_t(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen);
-
-static bin_convert_t bin_dir;
-static bin_convert_t bin_string;
-static bin_convert_t bin_intvec;
-static bin_convert_t bin_ulongvec;
-static bin_convert_t bin_uuid;
-static bin_convert_t bin_dn_node_address;
-
-#define CTL_DIR   bin_dir
-#define CTL_STR   bin_string
-#define CTL_INT   bin_intvec
-#define CTL_ULONG bin_ulongvec
-#define CTL_UUID  bin_uuid
-#define CTL_DNADR bin_dn_node_address
-
-#define BUFSZ 256
-
-struct bin_table {
-       bin_convert_t           *convert;
-       int                     ctl_name;
-       const char              *procname;
-       const struct bin_table  *child;
-};
-
-static const struct bin_table bin_random_table[] = {
-       { CTL_INT,      RANDOM_POOLSIZE,        "poolsize" },
-       { CTL_INT,      RANDOM_ENTROPY_COUNT,   "entropy_avail" },
-       { CTL_INT,      RANDOM_READ_THRESH,     "read_wakeup_threshold" },
-       { CTL_INT,      RANDOM_WRITE_THRESH,    "write_wakeup_threshold" },
-       { CTL_UUID,     RANDOM_BOOT_ID,         "boot_id" },
-       { CTL_UUID,     RANDOM_UUID,            "uuid" },
-       {}
-};
-
-static const struct bin_table bin_pty_table[] = {
-       { CTL_INT,      PTY_MAX,        "max" },
-       { CTL_INT,      PTY_NR,         "nr" },
-       {}
-};
-
-static const struct bin_table bin_kern_table[] = {
-       { CTL_STR,      KERN_OSTYPE,                    "ostype" },
-       { CTL_STR,      KERN_OSRELEASE,                 "osrelease" },
-       /* KERN_OSREV not used */
-       { CTL_STR,      KERN_VERSION,                   "version" },
-       /* KERN_SECUREMASK not used */
-       /* KERN_PROF not used */
-       { CTL_STR,      KERN_NODENAME,                  "hostname" },
-       { CTL_STR,      KERN_DOMAINNAME,                "domainname" },
-
-       { CTL_INT,      KERN_PANIC,                     "panic" },
-       { CTL_INT,      KERN_REALROOTDEV,               "real-root-dev" },
-
-       { CTL_STR,      KERN_SPARC_REBOOT,              "reboot-cmd" },
-       { CTL_INT,      KERN_CTLALTDEL,                 "ctrl-alt-del" },
-       { CTL_INT,      KERN_PRINTK,                    "printk" },
-
-       /* KERN_NAMETRANS not used */
-       /* KERN_PPC_HTABRECLAIM not used */
-       /* KERN_PPC_ZEROPAGED not used */
-       { CTL_INT,      KERN_PPC_POWERSAVE_NAP,         "powersave-nap" },
-
-       { CTL_STR,      KERN_MODPROBE,                  "modprobe" },
-       { CTL_INT,      KERN_SG_BIG_BUFF,               "sg-big-buff" },
-       { CTL_INT,      KERN_ACCT,                      "acct" },
-       /* KERN_PPC_L2CR "l2cr" no longer used */
-
-       /* KERN_RTSIGNR not used */
-       /* KERN_RTSIGMAX not used */
-
-       { CTL_ULONG,    KERN_SHMMAX,                    "shmmax" },
-       { CTL_INT,      KERN_MSGMAX,                    "msgmax" },
-       { CTL_INT,      KERN_MSGMNB,                    "msgmnb" },
-       /* KERN_MSGPOOL not used*/
-       { CTL_INT,      KERN_SYSRQ,                     "sysrq" },
-       { CTL_INT,      KERN_MAX_THREADS,               "threads-max" },
-       { CTL_DIR,      KERN_RANDOM,                    "random",       bin_random_table },
-       { CTL_ULONG,    KERN_SHMALL,                    "shmall" },
-       { CTL_INT,      KERN_MSGMNI,                    "msgmni" },
-       { CTL_INT,      KERN_SEM,                       "sem" },
-       { CTL_INT,      KERN_SPARC_STOP_A,              "stop-a" },
-       { CTL_INT,      KERN_SHMMNI,                    "shmmni" },
-
-       { CTL_INT,      KERN_OVERFLOWUID,               "overflowuid" },
-       { CTL_INT,      KERN_OVERFLOWGID,               "overflowgid" },
-
-       { CTL_STR,      KERN_HOTPLUG,                   "hotplug", },
-       { CTL_INT,      KERN_IEEE_EMULATION_WARNINGS,   "ieee_emulation_warnings" },
-
-       { CTL_INT,      KERN_S390_USER_DEBUG_LOGGING,   "userprocess_debug" },
-       { CTL_INT,      KERN_CORE_USES_PID,             "core_uses_pid" },
-       /* KERN_TAINTED "tainted" no longer used */
-       { CTL_INT,      KERN_CADPID,                    "cad_pid" },
-       { CTL_INT,      KERN_PIDMAX,                    "pid_max" },
-       { CTL_STR,      KERN_CORE_PATTERN,              "core_pattern" },
-       { CTL_INT,      KERN_PANIC_ON_OOPS,             "panic_on_oops" },
-       { CTL_INT,      KERN_HPPA_PWRSW,                "soft-power" },
-       { CTL_INT,      KERN_HPPA_UNALIGNED,            "unaligned-trap" },
-
-       { CTL_INT,      KERN_PRINTK_RATELIMIT,          "printk_ratelimit" },
-       { CTL_INT,      KERN_PRINTK_RATELIMIT_BURST,    "printk_ratelimit_burst" },
-
-       { CTL_DIR,      KERN_PTY,                       "pty",          bin_pty_table },
-       { CTL_INT,      KERN_NGROUPS_MAX,               "ngroups_max" },
-       { CTL_INT,      KERN_SPARC_SCONS_PWROFF,        "scons-poweroff" },
-       /* KERN_HZ_TIMER "hz_timer" no longer used */
-       { CTL_INT,      KERN_UNKNOWN_NMI_PANIC,         "unknown_nmi_panic" },
-       { CTL_INT,      KERN_BOOTLOADER_TYPE,           "bootloader_type" },
-       { CTL_INT,      KERN_RANDOMIZE,                 "randomize_va_space" },
-
-       { CTL_INT,      KERN_SPIN_RETRY,                "spin_retry" },
-       /* KERN_ACPI_VIDEO_FLAGS "acpi_video_flags" no longer used */
-       { CTL_INT,      KERN_IA64_UNALIGNED,            "ignore-unaligned-usertrap" },
-       { CTL_INT,      KERN_COMPAT_LOG,                "compat-log" },
-       { CTL_INT,      KERN_MAX_LOCK_DEPTH,            "max_lock_depth" },
-       { CTL_INT,      KERN_PANIC_ON_NMI,              "panic_on_unrecovered_nmi" },
-       { CTL_INT,      KERN_PANIC_ON_WARN,             "panic_on_warn" },
-       { CTL_ULONG,    KERN_PANIC_PRINT,               "panic_print" },
-       {}
-};
-
-static const struct bin_table bin_vm_table[] = {
-       { CTL_INT,      VM_OVERCOMMIT_MEMORY,           "overcommit_memory" },
-       { CTL_INT,      VM_PAGE_CLUSTER,                "page-cluster" },
-       { CTL_INT,      VM_DIRTY_BACKGROUND,            "dirty_background_ratio" },
-       { CTL_INT,      VM_DIRTY_RATIO,                 "dirty_ratio" },
-       /* VM_DIRTY_WB_CS "dirty_writeback_centisecs" no longer used */
-       /* VM_DIRTY_EXPIRE_CS "dirty_expire_centisecs" no longer used */
-       /* VM_NR_PDFLUSH_THREADS "nr_pdflush_threads" no longer used */
-       { CTL_INT,      VM_OVERCOMMIT_RATIO,            "overcommit_ratio" },
-       /* VM_PAGEBUF unused */
-       /* VM_HUGETLB_PAGES "nr_hugepages" no longer used */
-       { CTL_INT,      VM_SWAPPINESS,                  "swappiness" },
-       { CTL_INT,      VM_LOWMEM_RESERVE_RATIO,        "lowmem_reserve_ratio" },
-       { CTL_INT,      VM_MIN_FREE_KBYTES,             "min_free_kbytes" },
-       { CTL_INT,      VM_MAX_MAP_COUNT,               "max_map_count" },
-       { CTL_INT,      VM_LAPTOP_MODE,                 "laptop_mode" },
-       { CTL_INT,      VM_BLOCK_DUMP,                  "block_dump" },
-       { CTL_INT,      VM_HUGETLB_GROUP,               "hugetlb_shm_group" },
-       { CTL_INT,      VM_VFS_CACHE_PRESSURE,  "vfs_cache_pressure" },
-       { CTL_INT,      VM_LEGACY_VA_LAYOUT,            "legacy_va_layout" },
-       /* VM_SWAP_TOKEN_TIMEOUT unused */
-       { CTL_INT,      VM_DROP_PAGECACHE,              "drop_caches" },
-       { CTL_INT,      VM_PERCPU_PAGELIST_FRACTION,    "percpu_pagelist_fraction" },
-       { CTL_INT,      VM_ZONE_RECLAIM_MODE,           "zone_reclaim_mode" },
-       { CTL_INT,      VM_MIN_UNMAPPED,                "min_unmapped_ratio" },
-       { CTL_INT,      VM_PANIC_ON_OOM,                "panic_on_oom" },
-       { CTL_INT,      VM_VDSO_ENABLED,                "vdso_enabled" },
-       { CTL_INT,      VM_MIN_SLAB,                    "min_slab_ratio" },
-
-       {}
-};
-
-static const struct bin_table bin_net_core_table[] = {
-       { CTL_INT,      NET_CORE_WMEM_MAX,      "wmem_max" },
-       { CTL_INT,      NET_CORE_RMEM_MAX,      "rmem_max" },
-       { CTL_INT,      NET_CORE_WMEM_DEFAULT,  "wmem_default" },
-       { CTL_INT,      NET_CORE_RMEM_DEFAULT,  "rmem_default" },
-       /* NET_CORE_DESTROY_DELAY unused */
-       { CTL_INT,      NET_CORE_MAX_BACKLOG,   "netdev_max_backlog" },
-       /* NET_CORE_FASTROUTE unused */
-       { CTL_INT,      NET_CORE_MSG_COST,      "message_cost" },
-       { CTL_INT,      NET_CORE_MSG_BURST,     "message_burst" },
-       { CTL_INT,      NET_CORE_OPTMEM_MAX,    "optmem_max" },
-       /* NET_CORE_HOT_LIST_LENGTH unused */
-       /* NET_CORE_DIVERT_VERSION unused */
-       /* NET_CORE_NO_CONG_THRESH unused */
-       /* NET_CORE_NO_CONG unused */
-       /* NET_CORE_LO_CONG unused */
-       /* NET_CORE_MOD_CONG unused */
-       { CTL_INT,      NET_CORE_DEV_WEIGHT,    "dev_weight" },
-       { CTL_INT,      NET_CORE_SOMAXCONN,     "somaxconn" },
-       { CTL_INT,      NET_CORE_BUDGET,        "netdev_budget" },
-       { CTL_INT,      NET_CORE_AEVENT_ETIME,  "xfrm_aevent_etime" },
-       { CTL_INT,      NET_CORE_AEVENT_RSEQTH, "xfrm_aevent_rseqth" },
-       { CTL_INT,      NET_CORE_WARNINGS,      "warnings" },
-       {},
-};
-
-static const struct bin_table bin_net_unix_table[] = {
-       /* NET_UNIX_DESTROY_DELAY unused */
-       /* NET_UNIX_DELETE_DELAY unused */
-       { CTL_INT,      NET_UNIX_MAX_DGRAM_QLEN,        "max_dgram_qlen" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv4_route_table[] = {
-       { CTL_INT,      NET_IPV4_ROUTE_FLUSH,                   "flush" },
-       /* NET_IPV4_ROUTE_MIN_DELAY "min_delay" no longer used */
-       /* NET_IPV4_ROUTE_MAX_DELAY "max_delay" no longer used */
-       { CTL_INT,      NET_IPV4_ROUTE_GC_THRESH,               "gc_thresh" },
-       { CTL_INT,      NET_IPV4_ROUTE_MAX_SIZE,                "max_size" },
-       { CTL_INT,      NET_IPV4_ROUTE_GC_MIN_INTERVAL,         "gc_min_interval" },
-       { CTL_INT,      NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,      "gc_min_interval_ms" },
-       { CTL_INT,      NET_IPV4_ROUTE_GC_TIMEOUT,              "gc_timeout" },
-       /* NET_IPV4_ROUTE_GC_INTERVAL "gc_interval" no longer used */
-       { CTL_INT,      NET_IPV4_ROUTE_REDIRECT_LOAD,           "redirect_load" },
-       { CTL_INT,      NET_IPV4_ROUTE_REDIRECT_NUMBER,         "redirect_number" },
-       { CTL_INT,      NET_IPV4_ROUTE_REDIRECT_SILENCE,        "redirect_silence" },
-       { CTL_INT,      NET_IPV4_ROUTE_ERROR_COST,              "error_cost" },
-       { CTL_INT,      NET_IPV4_ROUTE_ERROR_BURST,             "error_burst" },
-       { CTL_INT,      NET_IPV4_ROUTE_GC_ELASTICITY,           "gc_elasticity" },
-       { CTL_INT,      NET_IPV4_ROUTE_MTU_EXPIRES,             "mtu_expires" },
-       { CTL_INT,      NET_IPV4_ROUTE_MIN_PMTU,                "min_pmtu" },
-       { CTL_INT,      NET_IPV4_ROUTE_MIN_ADVMSS,              "min_adv_mss" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv4_conf_vars_table[] = {
-       { CTL_INT,      NET_IPV4_CONF_FORWARDING,               "forwarding" },
-       { CTL_INT,      NET_IPV4_CONF_MC_FORWARDING,            "mc_forwarding" },
-
-       { CTL_INT,      NET_IPV4_CONF_ACCEPT_REDIRECTS,         "accept_redirects" },
-       { CTL_INT,      NET_IPV4_CONF_SECURE_REDIRECTS,         "secure_redirects" },
-       { CTL_INT,      NET_IPV4_CONF_SEND_REDIRECTS,           "send_redirects" },
-       { CTL_INT,      NET_IPV4_CONF_SHARED_MEDIA,             "shared_media" },
-       { CTL_INT,      NET_IPV4_CONF_RP_FILTER,                "rp_filter" },
-       { CTL_INT,      NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,      "accept_source_route" },
-       { CTL_INT,      NET_IPV4_CONF_PROXY_ARP,                "proxy_arp" },
-       { CTL_INT,      NET_IPV4_CONF_MEDIUM_ID,                "medium_id" },
-       { CTL_INT,      NET_IPV4_CONF_BOOTP_RELAY,              "bootp_relay" },
-       { CTL_INT,      NET_IPV4_CONF_LOG_MARTIANS,             "log_martians" },
-       { CTL_INT,      NET_IPV4_CONF_TAG,                      "tag" },
-       { CTL_INT,      NET_IPV4_CONF_ARPFILTER,                "arp_filter" },
-       { CTL_INT,      NET_IPV4_CONF_ARP_ANNOUNCE,             "arp_announce" },
-       { CTL_INT,      NET_IPV4_CONF_ARP_IGNORE,               "arp_ignore" },
-       { CTL_INT,      NET_IPV4_CONF_ARP_ACCEPT,               "arp_accept" },
-       { CTL_INT,      NET_IPV4_CONF_ARP_NOTIFY,               "arp_notify" },
-
-       { CTL_INT,      NET_IPV4_CONF_NOXFRM,                   "disable_xfrm" },
-       { CTL_INT,      NET_IPV4_CONF_NOPOLICY,                 "disable_policy" },
-       { CTL_INT,      NET_IPV4_CONF_FORCE_IGMP_VERSION,       "force_igmp_version" },
-       { CTL_INT,      NET_IPV4_CONF_PROMOTE_SECONDARIES,      "promote_secondaries" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv4_conf_table[] = {
-       { CTL_DIR,      NET_PROTO_CONF_ALL,     "all",          bin_net_ipv4_conf_vars_table },
-       { CTL_DIR,      NET_PROTO_CONF_DEFAULT, "default",      bin_net_ipv4_conf_vars_table },
-       { CTL_DIR,      0, NULL, bin_net_ipv4_conf_vars_table },
-       {}
-};
-
-static const struct bin_table bin_net_neigh_vars_table[] = {
-       { CTL_INT,      NET_NEIGH_MCAST_SOLICIT,        "mcast_solicit" },
-       { CTL_INT,      NET_NEIGH_UCAST_SOLICIT,        "ucast_solicit" },
-       { CTL_INT,      NET_NEIGH_APP_SOLICIT,          "app_solicit" },
-       /* NET_NEIGH_RETRANS_TIME "retrans_time" no longer used */
-       { CTL_INT,      NET_NEIGH_REACHABLE_TIME,       "base_reachable_time" },
-       { CTL_INT,      NET_NEIGH_DELAY_PROBE_TIME,     "delay_first_probe_time" },
-       { CTL_INT,      NET_NEIGH_GC_STALE_TIME,        "gc_stale_time" },
-       { CTL_INT,      NET_NEIGH_UNRES_QLEN,           "unres_qlen" },
-       { CTL_INT,      NET_NEIGH_PROXY_QLEN,           "proxy_qlen" },
-       /* NET_NEIGH_ANYCAST_DELAY "anycast_delay" no longer used */
-       /* NET_NEIGH_PROXY_DELAY "proxy_delay" no longer used */
-       /* NET_NEIGH_LOCKTIME "locktime" no longer used */
-       { CTL_INT,      NET_NEIGH_GC_INTERVAL,          "gc_interval" },
-       { CTL_INT,      NET_NEIGH_GC_THRESH1,           "gc_thresh1" },
-       { CTL_INT,      NET_NEIGH_GC_THRESH2,           "gc_thresh2" },
-       { CTL_INT,      NET_NEIGH_GC_THRESH3,           "gc_thresh3" },
-       { CTL_INT,      NET_NEIGH_RETRANS_TIME_MS,      "retrans_time_ms" },
-       { CTL_INT,      NET_NEIGH_REACHABLE_TIME_MS,    "base_reachable_time_ms" },
-       {}
-};
-
-static const struct bin_table bin_net_neigh_table[] = {
-       { CTL_DIR,      NET_PROTO_CONF_DEFAULT, "default", bin_net_neigh_vars_table },
-       { CTL_DIR,      0, NULL, bin_net_neigh_vars_table },
-       {}
-};
-
-static const struct bin_table bin_net_ipv4_netfilter_table[] = {
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_MAX,              "ip_conntrack_max" },
-
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT "ip_conntrack_tcp_timeout_syn_sent" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV "ip_conntrack_tcp_timeout_syn_recv" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED "ip_conntrack_tcp_timeout_established" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT "ip_conntrack_tcp_timeout_fin_wait" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT "ip_conntrack_tcp_timeout_close_wait" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK "ip_conntrack_tcp_timeout_last_ack" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT "ip_conntrack_tcp_timeout_time_wait" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE "ip_conntrack_tcp_timeout_close" no longer used */
-
-       /* NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT "ip_conntrack_udp_timeout" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM "ip_conntrack_udp_timeout_stream" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT "ip_conntrack_icmp_timeout" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT "ip_conntrack_generic_timeout" no longer used */
-
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_BUCKETS,          "ip_conntrack_buckets" },
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_LOG_INVALID,      "ip_conntrack_log_invalid" },
-       /* NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS "ip_conntrack_tcp_timeout_max_retrans" no longer used */
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_TCP_LOOSE,        "ip_conntrack_tcp_loose" },
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_TCP_BE_LIBERAL,   "ip_conntrack_tcp_be_liberal" },
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_TCP_MAX_RETRANS,  "ip_conntrack_tcp_max_retrans" },
-
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED "ip_conntrack_sctp_timeout_closed" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT "ip_conntrack_sctp_timeout_cookie_wait" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED "ip_conntrack_sctp_timeout_cookie_echoed" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED "ip_conntrack_sctp_timeout_established" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT "ip_conntrack_sctp_timeout_shutdown_sent" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD "ip_conntrack_sctp_timeout_shutdown_recd" no longer used */
-       /* NET_IPV4_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT "ip_conntrack_sctp_timeout_shutdown_ack_sent" no longer used */
-
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_COUNT,            "ip_conntrack_count" },
-       { CTL_INT,      NET_IPV4_NF_CONNTRACK_CHECKSUM,         "ip_conntrack_checksum" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv4_table[] = {
-       {CTL_INT,       NET_IPV4_FORWARD,                       "ip_forward" },
-
-       { CTL_DIR,      NET_IPV4_CONF,          "conf",         bin_net_ipv4_conf_table },
-       { CTL_DIR,      NET_IPV4_NEIGH,         "neigh",        bin_net_neigh_table },
-       { CTL_DIR,      NET_IPV4_ROUTE,         "route",        bin_net_ipv4_route_table },
-       /* NET_IPV4_FIB_HASH unused */
-       { CTL_DIR,      NET_IPV4_NETFILTER,     "netfilter",    bin_net_ipv4_netfilter_table },
-
-       { CTL_INT,      NET_IPV4_TCP_TIMESTAMPS,                "tcp_timestamps" },
-       { CTL_INT,      NET_IPV4_TCP_WINDOW_SCALING,            "tcp_window_scaling" },
-       { CTL_INT,      NET_IPV4_TCP_SACK,                      "tcp_sack" },
-       { CTL_INT,      NET_IPV4_TCP_RETRANS_COLLAPSE,          "tcp_retrans_collapse" },
-       { CTL_INT,      NET_IPV4_DEFAULT_TTL,                   "ip_default_ttl" },
-       /* NET_IPV4_AUTOCONFIG unused */
-       { CTL_INT,      NET_IPV4_NO_PMTU_DISC,                  "ip_no_pmtu_disc" },
-       { CTL_INT,      NET_IPV4_NONLOCAL_BIND,                 "ip_nonlocal_bind" },
-       { CTL_INT,      NET_IPV4_TCP_SYN_RETRIES,               "tcp_syn_retries" },
-       { CTL_INT,      NET_TCP_SYNACK_RETRIES,                 "tcp_synack_retries" },
-       { CTL_INT,      NET_TCP_MAX_ORPHANS,                    "tcp_max_orphans" },
-       { CTL_INT,      NET_TCP_MAX_TW_BUCKETS,                 "tcp_max_tw_buckets" },
-       { CTL_INT,      NET_IPV4_DYNADDR,                       "ip_dynaddr" },
-       { CTL_INT,      NET_IPV4_TCP_KEEPALIVE_TIME,            "tcp_keepalive_time" },
-       { CTL_INT,      NET_IPV4_TCP_KEEPALIVE_PROBES,          "tcp_keepalive_probes" },
-       { CTL_INT,      NET_IPV4_TCP_KEEPALIVE_INTVL,           "tcp_keepalive_intvl" },
-       { CTL_INT,      NET_IPV4_TCP_RETRIES1,                  "tcp_retries1" },
-       { CTL_INT,      NET_IPV4_TCP_RETRIES2,                  "tcp_retries2" },
-       { CTL_INT,      NET_IPV4_TCP_FIN_TIMEOUT,               "tcp_fin_timeout" },
-       { CTL_INT,      NET_TCP_SYNCOOKIES,                     "tcp_syncookies" },
-       { CTL_INT,      NET_TCP_TW_RECYCLE,                     "tcp_tw_recycle" },
-       { CTL_INT,      NET_TCP_ABORT_ON_OVERFLOW,              "tcp_abort_on_overflow" },
-       { CTL_INT,      NET_TCP_STDURG,                         "tcp_stdurg" },
-       { CTL_INT,      NET_TCP_RFC1337,                        "tcp_rfc1337" },
-       { CTL_INT,      NET_TCP_MAX_SYN_BACKLOG,                "tcp_max_syn_backlog" },
-       { CTL_INT,      NET_IPV4_LOCAL_PORT_RANGE,              "ip_local_port_range" },
-       { CTL_INT,      NET_IPV4_IGMP_MAX_MEMBERSHIPS,          "igmp_max_memberships" },
-       { CTL_INT,      NET_IPV4_IGMP_MAX_MSF,                  "igmp_max_msf" },
-       { CTL_INT,      NET_IPV4_INET_PEER_THRESHOLD,           "inet_peer_threshold" },
-       { CTL_INT,      NET_IPV4_INET_PEER_MINTTL,              "inet_peer_minttl" },
-       { CTL_INT,      NET_IPV4_INET_PEER_MAXTTL,              "inet_peer_maxttl" },
-       { CTL_INT,      NET_IPV4_INET_PEER_GC_MINTIME,          "inet_peer_gc_mintime" },
-       { CTL_INT,      NET_IPV4_INET_PEER_GC_MAXTIME,          "inet_peer_gc_maxtime" },
-       { CTL_INT,      NET_TCP_ORPHAN_RETRIES,                 "tcp_orphan_retries" },
-       { CTL_INT,      NET_TCP_FACK,                           "tcp_fack" },
-       { CTL_INT,      NET_TCP_REORDERING,                     "tcp_reordering" },
-       { CTL_INT,      NET_TCP_ECN,                            "tcp_ecn" },
-       { CTL_INT,      NET_TCP_DSACK,                          "tcp_dsack" },
-       { CTL_INT,      NET_TCP_MEM,                            "tcp_mem" },
-       { CTL_INT,      NET_TCP_WMEM,                           "tcp_wmem" },
-       { CTL_INT,      NET_TCP_RMEM,                           "tcp_rmem" },
-       { CTL_INT,      NET_TCP_APP_WIN,                        "tcp_app_win" },
-       { CTL_INT,      NET_TCP_ADV_WIN_SCALE,                  "tcp_adv_win_scale" },
-       { CTL_INT,      NET_TCP_TW_REUSE,                       "tcp_tw_reuse" },
-       { CTL_INT,      NET_TCP_FRTO,                           "tcp_frto" },
-       { CTL_INT,      NET_TCP_FRTO_RESPONSE,                  "tcp_frto_response" },
-       { CTL_INT,      NET_TCP_LOW_LATENCY,                    "tcp_low_latency" },
-       { CTL_INT,      NET_TCP_NO_METRICS_SAVE,                "tcp_no_metrics_save" },
-       { CTL_INT,      NET_TCP_MODERATE_RCVBUF,                "tcp_moderate_rcvbuf" },
-       { CTL_INT,      NET_TCP_TSO_WIN_DIVISOR,                "tcp_tso_win_divisor" },
-       { CTL_STR,      NET_TCP_CONG_CONTROL,                   "tcp_congestion_control" },
-       { CTL_INT,      NET_TCP_MTU_PROBING,                    "tcp_mtu_probing" },
-       { CTL_INT,      NET_TCP_BASE_MSS,                       "tcp_base_mss" },
-       { CTL_INT,      NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, "tcp_workaround_signed_windows" },
-       { CTL_INT,      NET_TCP_SLOW_START_AFTER_IDLE,          "tcp_slow_start_after_idle" },
-       { CTL_INT,      NET_CIPSOV4_CACHE_ENABLE,               "cipso_cache_enable" },
-       { CTL_INT,      NET_CIPSOV4_CACHE_BUCKET_SIZE,          "cipso_cache_bucket_size" },
-       { CTL_INT,      NET_CIPSOV4_RBM_OPTFMT,                 "cipso_rbm_optfmt" },
-       { CTL_INT,      NET_CIPSOV4_RBM_STRICTVALID,            "cipso_rbm_strictvalid" },
-       /* NET_TCP_AVAIL_CONG_CONTROL "tcp_available_congestion_control" no longer used */
-       { CTL_STR,      NET_TCP_ALLOWED_CONG_CONTROL,           "tcp_allowed_congestion_control" },
-       { CTL_INT,      NET_TCP_MAX_SSTHRESH,                   "tcp_max_ssthresh" },
-
-       { CTL_INT,      NET_IPV4_ICMP_ECHO_IGNORE_ALL,          "icmp_echo_ignore_all" },
-       { CTL_INT,      NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS,   "icmp_echo_ignore_broadcasts" },
-       { CTL_INT,      NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES,     "icmp_ignore_bogus_error_responses" },
-       { CTL_INT,      NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR,        "icmp_errors_use_inbound_ifaddr" },
-       { CTL_INT,      NET_IPV4_ICMP_RATELIMIT,                "icmp_ratelimit" },
-       { CTL_INT,      NET_IPV4_ICMP_RATEMASK,                 "icmp_ratemask" },
-
-       { CTL_INT,      NET_IPV4_IPFRAG_HIGH_THRESH,            "ipfrag_high_thresh" },
-       { CTL_INT,      NET_IPV4_IPFRAG_LOW_THRESH,             "ipfrag_low_thresh" },
-       { CTL_INT,      NET_IPV4_IPFRAG_TIME,                   "ipfrag_time" },
-
-       { CTL_INT,      NET_IPV4_IPFRAG_SECRET_INTERVAL,        "ipfrag_secret_interval" },
-       /* NET_IPV4_IPFRAG_MAX_DIST "ipfrag_max_dist" no longer used */
-
-       { CTL_INT,      2088 /* NET_IPQ_QMAX */,                "ip_queue_maxlen" },
-
-       /* NET_TCP_DEFAULT_WIN_SCALE unused */
-       /* NET_TCP_BIC_BETA unused */
-       /* NET_IPV4_TCP_MAX_KA_PROBES unused */
-       /* NET_IPV4_IP_MASQ_DEBUG unused */
-       /* NET_TCP_SYN_TAILDROP unused */
-       /* NET_IPV4_ICMP_SOURCEQUENCH_RATE unused */
-       /* NET_IPV4_ICMP_DESTUNREACH_RATE unused */
-       /* NET_IPV4_ICMP_TIMEEXCEED_RATE unused */
-       /* NET_IPV4_ICMP_PARAMPROB_RATE unused */
-       /* NET_IPV4_ICMP_ECHOREPLY_RATE unused */
-       /* NET_IPV4_ALWAYS_DEFRAG unused */
-       {}
-};
-
-static const struct bin_table bin_net_ipx_table[] = {
-       { CTL_INT,      NET_IPX_PPROP_BROADCASTING,     "ipx_pprop_broadcasting" },
-       /* NET_IPX_FORWARDING unused */
-       {}
-};
-
-static const struct bin_table bin_net_atalk_table[] = {
-       { CTL_INT,      NET_ATALK_AARP_EXPIRY_TIME,             "aarp-expiry-time" },
-       { CTL_INT,      NET_ATALK_AARP_TICK_TIME,               "aarp-tick-time" },
-       { CTL_INT,      NET_ATALK_AARP_RETRANSMIT_LIMIT,        "aarp-retransmit-limit" },
-       { CTL_INT,      NET_ATALK_AARP_RESOLVE_TIME,            "aarp-resolve-time" },
-       {},
-};
-
-static const struct bin_table bin_net_netrom_table[] = {
-       { CTL_INT,      NET_NETROM_DEFAULT_PATH_QUALITY,                "default_path_quality" },
-       { CTL_INT,      NET_NETROM_OBSOLESCENCE_COUNT_INITIALISER,      "obsolescence_count_initialiser" },
-       { CTL_INT,      NET_NETROM_NETWORK_TTL_INITIALISER,             "network_ttl_initialiser" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_TIMEOUT,                   "transport_timeout" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_MAXIMUM_TRIES,             "transport_maximum_tries" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_ACKNOWLEDGE_DELAY,         "transport_acknowledge_delay" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_BUSY_DELAY,                "transport_busy_delay" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_REQUESTED_WINDOW_SIZE,     "transport_requested_window_size" },
-       { CTL_INT,      NET_NETROM_TRANSPORT_NO_ACTIVITY_TIMEOUT,       "transport_no_activity_timeout" },
-       { CTL_INT,      NET_NETROM_ROUTING_CONTROL,                     "routing_control" },
-       { CTL_INT,      NET_NETROM_LINK_FAILS_COUNT,                    "link_fails_count" },
-       { CTL_INT,      NET_NETROM_RESET,                               "reset" },
-       {}
-};
-
-static const struct bin_table bin_net_ax25_param_table[] = {
-       { CTL_INT,      NET_AX25_IP_DEFAULT_MODE,       "ip_default_mode" },
-       { CTL_INT,      NET_AX25_DEFAULT_MODE,          "ax25_default_mode" },
-       { CTL_INT,      NET_AX25_BACKOFF_TYPE,          "backoff_type" },
-       { CTL_INT,      NET_AX25_CONNECT_MODE,          "connect_mode" },
-       { CTL_INT,      NET_AX25_STANDARD_WINDOW,       "standard_window_size" },
-       { CTL_INT,      NET_AX25_EXTENDED_WINDOW,       "extended_window_size" },
-       { CTL_INT,      NET_AX25_T1_TIMEOUT,            "t1_timeout" },
-       { CTL_INT,      NET_AX25_T2_TIMEOUT,            "t2_timeout" },
-       { CTL_INT,      NET_AX25_T3_TIMEOUT,            "t3_timeout" },
-       { CTL_INT,      NET_AX25_IDLE_TIMEOUT,          "idle_timeout" },
-       { CTL_INT,      NET_AX25_N2,                    "maximum_retry_count" },
-       { CTL_INT,      NET_AX25_PACLEN,                "maximum_packet_length" },
-       { CTL_INT,      NET_AX25_PROTOCOL,              "protocol" },
-       { CTL_INT,      NET_AX25_DAMA_SLAVE_TIMEOUT,    "dama_slave_timeout" },
-       {}
-};
-
-static const struct bin_table bin_net_ax25_table[] = {
-       { CTL_DIR,      0, NULL, bin_net_ax25_param_table },
-       {}
-};
-
-static const struct bin_table bin_net_rose_table[] = {
-       { CTL_INT,      NET_ROSE_RESTART_REQUEST_TIMEOUT,       "restart_request_timeout" },
-       { CTL_INT,      NET_ROSE_CALL_REQUEST_TIMEOUT,          "call_request_timeout" },
-       { CTL_INT,      NET_ROSE_RESET_REQUEST_TIMEOUT,         "reset_request_timeout" },
-       { CTL_INT,      NET_ROSE_CLEAR_REQUEST_TIMEOUT,         "clear_request_timeout" },
-       { CTL_INT,      NET_ROSE_ACK_HOLD_BACK_TIMEOUT,         "acknowledge_hold_back_timeout" },
-       { CTL_INT,      NET_ROSE_ROUTING_CONTROL,               "routing_control" },
-       { CTL_INT,      NET_ROSE_LINK_FAIL_TIMEOUT,             "link_fail_timeout" },
-       { CTL_INT,      NET_ROSE_MAX_VCS,                       "maximum_virtual_circuits" },
-       { CTL_INT,      NET_ROSE_WINDOW_SIZE,                   "window_size" },
-       { CTL_INT,      NET_ROSE_NO_ACTIVITY_TIMEOUT,           "no_activity_timeout" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv6_conf_var_table[] = {
-       { CTL_INT,      NET_IPV6_FORWARDING,                    "forwarding" },
-       { CTL_INT,      NET_IPV6_HOP_LIMIT,                     "hop_limit" },
-       { CTL_INT,      NET_IPV6_MTU,                           "mtu" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA,                     "accept_ra" },
-       { CTL_INT,      NET_IPV6_ACCEPT_REDIRECTS,              "accept_redirects" },
-       { CTL_INT,      NET_IPV6_AUTOCONF,                      "autoconf" },
-       { CTL_INT,      NET_IPV6_DAD_TRANSMITS,                 "dad_transmits" },
-       { CTL_INT,      NET_IPV6_RTR_SOLICITS,                  "router_solicitations" },
-       { CTL_INT,      NET_IPV6_RTR_SOLICIT_INTERVAL,          "router_solicitation_interval" },
-       { CTL_INT,      NET_IPV6_RTR_SOLICIT_DELAY,             "router_solicitation_delay" },
-       { CTL_INT,      NET_IPV6_USE_TEMPADDR,                  "use_tempaddr" },
-       { CTL_INT,      NET_IPV6_TEMP_VALID_LFT,                "temp_valid_lft" },
-       { CTL_INT,      NET_IPV6_TEMP_PREFERED_LFT,             "temp_prefered_lft" },
-       { CTL_INT,      NET_IPV6_REGEN_MAX_RETRY,               "regen_max_retry" },
-       { CTL_INT,      NET_IPV6_MAX_DESYNC_FACTOR,             "max_desync_factor" },
-       { CTL_INT,      NET_IPV6_MAX_ADDRESSES,                 "max_addresses" },
-       { CTL_INT,      NET_IPV6_FORCE_MLD_VERSION,             "force_mld_version" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA_DEFRTR,              "accept_ra_defrtr" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA_PINFO,               "accept_ra_pinfo" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA_RTR_PREF,            "accept_ra_rtr_pref" },
-       { CTL_INT,      NET_IPV6_RTR_PROBE_INTERVAL,            "router_probe_interval" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA_RT_INFO_MAX_PLEN,    "accept_ra_rt_info_max_plen" },
-       { CTL_INT,      NET_IPV6_PROXY_NDP,                     "proxy_ndp" },
-       { CTL_INT,      NET_IPV6_ACCEPT_SOURCE_ROUTE,           "accept_source_route" },
-       { CTL_INT,      NET_IPV6_ACCEPT_RA_FROM_LOCAL,          "accept_ra_from_local" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv6_conf_table[] = {
-       { CTL_DIR,      NET_PROTO_CONF_ALL,             "all",  bin_net_ipv6_conf_var_table },
-       { CTL_DIR,      NET_PROTO_CONF_DEFAULT,         "default", bin_net_ipv6_conf_var_table },
-       { CTL_DIR,      0, NULL, bin_net_ipv6_conf_var_table },
-       {}
-};
-
-static const struct bin_table bin_net_ipv6_route_table[] = {
-       /* NET_IPV6_ROUTE_FLUSH "flush"  no longer used */
-       { CTL_INT,      NET_IPV6_ROUTE_GC_THRESH,               "gc_thresh" },
-       { CTL_INT,      NET_IPV6_ROUTE_MAX_SIZE,                "max_size" },
-       { CTL_INT,      NET_IPV6_ROUTE_GC_MIN_INTERVAL,         "gc_min_interval" },
-       { CTL_INT,      NET_IPV6_ROUTE_GC_TIMEOUT,              "gc_timeout" },
-       { CTL_INT,      NET_IPV6_ROUTE_GC_INTERVAL,             "gc_interval" },
-       { CTL_INT,      NET_IPV6_ROUTE_GC_ELASTICITY,           "gc_elasticity" },
-       { CTL_INT,      NET_IPV6_ROUTE_MTU_EXPIRES,             "mtu_expires" },
-       { CTL_INT,      NET_IPV6_ROUTE_MIN_ADVMSS,              "min_adv_mss" },
-       { CTL_INT,      NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS,      "gc_min_interval_ms" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv6_icmp_table[] = {
-       { CTL_INT,      NET_IPV6_ICMP_RATELIMIT,        "ratelimit" },
-       {}
-};
-
-static const struct bin_table bin_net_ipv6_table[] = {
-       { CTL_DIR,      NET_IPV6_CONF,          "conf",         bin_net_ipv6_conf_table },
-       { CTL_DIR,      NET_IPV6_NEIGH,         "neigh",        bin_net_neigh_table },
-       { CTL_DIR,      NET_IPV6_ROUTE,         "route",        bin_net_ipv6_route_table },
-       { CTL_DIR,      NET_IPV6_ICMP,          "icmp",         bin_net_ipv6_icmp_table },
-       { CTL_INT,      NET_IPV6_BINDV6ONLY,            "bindv6only" },
-       { CTL_INT,      NET_IPV6_IP6FRAG_HIGH_THRESH,   "ip6frag_high_thresh" },
-       { CTL_INT,      NET_IPV6_IP6FRAG_LOW_THRESH,    "ip6frag_low_thresh" },
-       { CTL_INT,      NET_IPV6_IP6FRAG_TIME,          "ip6frag_time" },
-       { CTL_INT,      NET_IPV6_IP6FRAG_SECRET_INTERVAL,       "ip6frag_secret_interval" },
-       { CTL_INT,      NET_IPV6_MLD_MAX_MSF,           "mld_max_msf" },
-       { CTL_INT,      2088 /* IPQ_QMAX */,            "ip6_queue_maxlen" },
-       {}
-};
-
-static const struct bin_table bin_net_x25_table[] = {
-       { CTL_INT,      NET_X25_RESTART_REQUEST_TIMEOUT,        "restart_request_timeout" },
-       { CTL_INT,      NET_X25_CALL_REQUEST_TIMEOUT,           "call_request_timeout" },
-       { CTL_INT,      NET_X25_RESET_REQUEST_TIMEOUT,  "reset_request_timeout" },
-       { CTL_INT,      NET_X25_CLEAR_REQUEST_TIMEOUT,  "clear_request_timeout" },
-       { CTL_INT,      NET_X25_ACK_HOLD_BACK_TIMEOUT,  "acknowledgement_hold_back_timeout" },
-       { CTL_INT,      NET_X25_FORWARD,                        "x25_forward" },
-       {}
-};
-
-static const struct bin_table bin_net_tr_table[] = {
-       { CTL_INT,      NET_TR_RIF_TIMEOUT,     "rif_timeout" },
-       {}
-};
-
-
-static const struct bin_table bin_net_decnet_conf_vars[] = {
-       { CTL_INT,      NET_DECNET_CONF_DEV_FORWARDING, "forwarding" },
-       { CTL_INT,      NET_DECNET_CONF_DEV_PRIORITY,   "priority" },
-       { CTL_INT,      NET_DECNET_CONF_DEV_T2,         "t2" },
-       { CTL_INT,      NET_DECNET_CONF_DEV_T3,         "t3" },
-       {}
-};
-
-static const struct bin_table bin_net_decnet_conf[] = {
-       { CTL_DIR, NET_DECNET_CONF_ETHER,    "ethernet", bin_net_decnet_conf_vars },
-       { CTL_DIR, NET_DECNET_CONF_GRE,      "ipgre",    bin_net_decnet_conf_vars },
-       { CTL_DIR, NET_DECNET_CONF_X25,      "x25",      bin_net_decnet_conf_vars },
-       { CTL_DIR, NET_DECNET_CONF_PPP,      "ppp",      bin_net_decnet_conf_vars },
-       { CTL_DIR, NET_DECNET_CONF_DDCMP,    "ddcmp",    bin_net_decnet_conf_vars },
-       { CTL_DIR, NET_DECNET_CONF_LOOPBACK, "loopback", bin_net_decnet_conf_vars },
-       { CTL_DIR, 0,                        NULL,       bin_net_decnet_conf_vars },
-       {}
-};
-
-static const struct bin_table bin_net_decnet_table[] = {
-       { CTL_DIR,      NET_DECNET_CONF,                "conf", bin_net_decnet_conf },
-       { CTL_DNADR,    NET_DECNET_NODE_ADDRESS,        "node_address" },
-       { CTL_STR,      NET_DECNET_NODE_NAME,           "node_name" },
-       { CTL_STR,      NET_DECNET_DEFAULT_DEVICE,      "default_device" },
-       { CTL_INT,      NET_DECNET_TIME_WAIT,           "time_wait" },
-       { CTL_INT,      NET_DECNET_DN_COUNT,            "dn_count" },
-       { CTL_INT,      NET_DECNET_DI_COUNT,            "di_count" },
-       { CTL_INT,      NET_DECNET_DR_COUNT,            "dr_count" },
-       { CTL_INT,      NET_DECNET_DST_GC_INTERVAL,     "dst_gc_interval" },
-       { CTL_INT,      NET_DECNET_NO_FC_MAX_CWND,      "no_fc_max_cwnd" },
-       { CTL_INT,      NET_DECNET_MEM,         "decnet_mem" },
-       { CTL_INT,      NET_DECNET_RMEM,                "decnet_rmem" },
-       { CTL_INT,      NET_DECNET_WMEM,                "decnet_wmem" },
-       { CTL_INT,      NET_DECNET_DEBUG_LEVEL, "debug" },
-       {}
-};
-
-static const struct bin_table bin_net_sctp_table[] = {
-       { CTL_INT,      NET_SCTP_RTO_INITIAL,           "rto_initial" },
-       { CTL_INT,      NET_SCTP_RTO_MIN,               "rto_min" },
-       { CTL_INT,      NET_SCTP_RTO_MAX,               "rto_max" },
-       { CTL_INT,      NET_SCTP_RTO_ALPHA,             "rto_alpha_exp_divisor" },
-       { CTL_INT,      NET_SCTP_RTO_BETA,              "rto_beta_exp_divisor" },
-       { CTL_INT,      NET_SCTP_VALID_COOKIE_LIFE,     "valid_cookie_life" },
-       { CTL_INT,      NET_SCTP_ASSOCIATION_MAX_RETRANS,       "association_max_retrans" },
-       { CTL_INT,      NET_SCTP_PATH_MAX_RETRANS,      "path_max_retrans" },
-       { CTL_INT,      NET_SCTP_MAX_INIT_RETRANSMITS,  "max_init_retransmits" },
-       { CTL_INT,      NET_SCTP_HB_INTERVAL,           "hb_interval" },
-       { CTL_INT,      NET_SCTP_PRESERVE_ENABLE,       "cookie_preserve_enable" },
-       { CTL_INT,      NET_SCTP_MAX_BURST,             "max_burst" },
-       { CTL_INT,      NET_SCTP_ADDIP_ENABLE,          "addip_enable" },
-       { CTL_INT,      NET_SCTP_PRSCTP_ENABLE,         "prsctp_enable" },
-       { CTL_INT,      NET_SCTP_SNDBUF_POLICY,         "sndbuf_policy" },
-       { CTL_INT,      NET_SCTP_SACK_TIMEOUT,          "sack_timeout" },
-       { CTL_INT,      NET_SCTP_RCVBUF_POLICY,         "rcvbuf_policy" },
-       {}
-};
-
-static const struct bin_table bin_net_llc_llc2_timeout_table[] = {
-       { CTL_INT,      NET_LLC2_ACK_TIMEOUT,   "ack" },
-       { CTL_INT,      NET_LLC2_P_TIMEOUT,     "p" },
-       { CTL_INT,      NET_LLC2_REJ_TIMEOUT,   "rej" },
-       { CTL_INT,      NET_LLC2_BUSY_TIMEOUT,  "busy" },
-       {}
-};
-
-static const struct bin_table bin_net_llc_station_table[] = {
-       { CTL_INT,      NET_LLC_STATION_ACK_TIMEOUT,    "ack_timeout" },
-       {}
-};
-
-static const struct bin_table bin_net_llc_llc2_table[] = {
-       { CTL_DIR,      NET_LLC2,               "timeout",      bin_net_llc_llc2_timeout_table },
-       {}
-};
-
-static const struct bin_table bin_net_llc_table[] = {
-       { CTL_DIR,      NET_LLC2,               "llc2",         bin_net_llc_llc2_table },
-       { CTL_DIR,      NET_LLC_STATION,        "station",      bin_net_llc_station_table },
-       {}
-};
-
-static const struct bin_table bin_net_netfilter_table[] = {
-       { CTL_INT,      NET_NF_CONNTRACK_MAX,                   "nf_conntrack_max" },
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT "nf_conntrack_tcp_timeout_syn_sent" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV "nf_conntrack_tcp_timeout_syn_recv" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED "nf_conntrack_tcp_timeout_established" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT "nf_conntrack_tcp_timeout_fin_wait" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT "nf_conntrack_tcp_timeout_close_wait" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK "nf_conntrack_tcp_timeout_last_ack" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT "nf_conntrack_tcp_timeout_time_wait" no longer used */
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_CLOSE "nf_conntrack_tcp_timeout_close" no longer used */
-       /* NET_NF_CONNTRACK_UDP_TIMEOUT "nf_conntrack_udp_timeout" no longer used */
-       /* NET_NF_CONNTRACK_UDP_TIMEOUT_STREAM "nf_conntrack_udp_timeout_stream" no longer used */
-       /* NET_NF_CONNTRACK_ICMP_TIMEOUT "nf_conntrack_icmp_timeout" no longer used */
-       /* NET_NF_CONNTRACK_GENERIC_TIMEOUT "nf_conntrack_generic_timeout" no longer used */
-       { CTL_INT,      NET_NF_CONNTRACK_BUCKETS,               "nf_conntrack_buckets" },
-       { CTL_INT,      NET_NF_CONNTRACK_LOG_INVALID,           "nf_conntrack_log_invalid" },
-       /* NET_NF_CONNTRACK_TCP_TIMEOUT_MAX_RETRANS "nf_conntrack_tcp_timeout_max_retrans" no longer used */
-       { CTL_INT,      NET_NF_CONNTRACK_TCP_LOOSE,             "nf_conntrack_tcp_loose" },
-       { CTL_INT,      NET_NF_CONNTRACK_TCP_BE_LIBERAL,        "nf_conntrack_tcp_be_liberal" },
-       { CTL_INT,      NET_NF_CONNTRACK_TCP_MAX_RETRANS,       "nf_conntrack_tcp_max_retrans" },
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_CLOSED "nf_conntrack_sctp_timeout_closed" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_WAIT "nf_conntrack_sctp_timeout_cookie_wait" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_COOKIE_ECHOED "nf_conntrack_sctp_timeout_cookie_echoed" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_ESTABLISHED "nf_conntrack_sctp_timeout_established" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_SENT "nf_conntrack_sctp_timeout_shutdown_sent" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_RECD "nf_conntrack_sctp_timeout_shutdown_recd" no longer used */
-       /* NET_NF_CONNTRACK_SCTP_TIMEOUT_SHUTDOWN_ACK_SENT "nf_conntrack_sctp_timeout_shutdown_ack_sent" no longer used */
-       { CTL_INT,      NET_NF_CONNTRACK_COUNT,                 "nf_conntrack_count" },
-       /* NET_NF_CONNTRACK_ICMPV6_TIMEOUT "nf_conntrack_icmpv6_timeout" no longer used */
-       /* NET_NF_CONNTRACK_FRAG6_TIMEOUT "nf_conntrack_frag6_timeout" no longer used */
-       { CTL_INT,      NET_NF_CONNTRACK_FRAG6_LOW_THRESH,      "nf_conntrack_frag6_low_thresh" },
-       { CTL_INT,      NET_NF_CONNTRACK_FRAG6_HIGH_THRESH,     "nf_conntrack_frag6_high_thresh" },
-       { CTL_INT,      NET_NF_CONNTRACK_CHECKSUM,              "nf_conntrack_checksum" },
-
-       {}
-};
-
-static const struct bin_table bin_net_table[] = {
-       { CTL_DIR,      NET_CORE,               "core",         bin_net_core_table },
-       /* NET_ETHER not used */
-       /* NET_802 not used */
-       { CTL_DIR,      NET_UNIX,               "unix",         bin_net_unix_table },
-       { CTL_DIR,      NET_IPV4,               "ipv4",         bin_net_ipv4_table },
-       { CTL_DIR,      NET_IPX,                "ipx",          bin_net_ipx_table },
-       { CTL_DIR,      NET_ATALK,              "appletalk",    bin_net_atalk_table },
-       { CTL_DIR,      NET_NETROM,             "netrom",       bin_net_netrom_table },
-       { CTL_DIR,      NET_AX25,               "ax25",         bin_net_ax25_table },
-       /*  NET_BRIDGE "bridge" no longer used */
-       { CTL_DIR,      NET_ROSE,               "rose",         bin_net_rose_table },
-       { CTL_DIR,      NET_IPV6,               "ipv6",         bin_net_ipv6_table },
-       { CTL_DIR,      NET_X25,                "x25",          bin_net_x25_table },
-       { CTL_DIR,      NET_TR,                 "token-ring",   bin_net_tr_table },
-       { CTL_DIR,      NET_DECNET,             "decnet",       bin_net_decnet_table },
-       /*  NET_ECONET not used */
-       { CTL_DIR,      NET_SCTP,               "sctp",         bin_net_sctp_table },
-       { CTL_DIR,      NET_LLC,                "llc",          bin_net_llc_table },
-       { CTL_DIR,      NET_NETFILTER,          "netfilter",    bin_net_netfilter_table },
-       /* NET_DCCP "dccp" no longer used */
-       /* NET_IRDA "irda" no longer used */
-       { CTL_INT,      2089,                   "nf_conntrack_max" },
-       {}
-};
-
-static const struct bin_table bin_fs_quota_table[] = {
-       { CTL_INT,      FS_DQ_LOOKUPS,          "lookups" },
-       { CTL_INT,      FS_DQ_DROPS,            "drops" },
-       { CTL_INT,      FS_DQ_READS,            "reads" },
-       { CTL_INT,      FS_DQ_WRITES,           "writes" },
-       { CTL_INT,      FS_DQ_CACHE_HITS,       "cache_hits" },
-       { CTL_INT,      FS_DQ_ALLOCATED,        "allocated_dquots" },
-       { CTL_INT,      FS_DQ_FREE,             "free_dquots" },
-       { CTL_INT,      FS_DQ_SYNCS,            "syncs" },
-       { CTL_INT,      FS_DQ_WARNINGS,         "warnings" },
-       {}
-};
-
-static const struct bin_table bin_fs_xfs_table[] = {
-       { CTL_INT,      XFS_SGID_INHERIT,       "irix_sgid_inherit" },
-       { CTL_INT,      XFS_SYMLINK_MODE,       "irix_symlink_mode" },
-       { CTL_INT,      XFS_PANIC_MASK,         "panic_mask" },
-
-       { CTL_INT,      XFS_ERRLEVEL,           "error_level" },
-       { CTL_INT,      XFS_SYNCD_TIMER,        "xfssyncd_centisecs" },
-       { CTL_INT,      XFS_INHERIT_SYNC,       "inherit_sync" },
-       { CTL_INT,      XFS_INHERIT_NODUMP,     "inherit_nodump" },
-       { CTL_INT,      XFS_INHERIT_NOATIME,    "inherit_noatime" },
-       { CTL_INT,      XFS_BUF_TIMER,          "xfsbufd_centisecs" },
-       { CTL_INT,      XFS_BUF_AGE,            "age_buffer_centisecs" },
-       { CTL_INT,      XFS_INHERIT_NOSYM,      "inherit_nosymlinks" },
-       { CTL_INT,      XFS_ROTORSTEP,  "rotorstep" },
-       { CTL_INT,      XFS_INHERIT_NODFRG,     "inherit_nodefrag" },
-       { CTL_INT,      XFS_FILESTREAM_TIMER,   "filestream_centisecs" },
-       { CTL_INT,      XFS_STATS_CLEAR,        "stats_clear" },
-       {}
-};
-
-static const struct bin_table bin_fs_ocfs2_nm_table[] = {
-       { CTL_STR,      1, "hb_ctl_path" },
-       {}
-};
-
-static const struct bin_table bin_fs_ocfs2_table[] = {
-       { CTL_DIR,      1,      "nm",   bin_fs_ocfs2_nm_table },
-       {}
-};
-
-static const struct bin_table bin_inotify_table[] = {
-       { CTL_INT,      INOTIFY_MAX_USER_INSTANCES,     "max_user_instances" },
-       { CTL_INT,      INOTIFY_MAX_USER_WATCHES,       "max_user_watches" },
-       { CTL_INT,      INOTIFY_MAX_QUEUED_EVENTS,      "max_queued_events" },
-       {}
-};
-
-static const struct bin_table bin_fs_table[] = {
-       { CTL_INT,      FS_NRINODE,             "inode-nr" },
-       { CTL_INT,      FS_STATINODE,           "inode-state" },
-       /* FS_MAXINODE unused */
-       /* FS_NRDQUOT unused */
-       /* FS_MAXDQUOT unused */
-       /* FS_NRFILE "file-nr" no longer used */
-       { CTL_INT,      FS_MAXFILE,             "file-max" },
-       { CTL_INT,      FS_DENTRY,              "dentry-state" },
-       /* FS_NRSUPER unused */
-       /* FS_MAXUPSER unused */
-       { CTL_INT,      FS_OVERFLOWUID,         "overflowuid" },
-       { CTL_INT,      FS_OVERFLOWGID,         "overflowgid" },
-       { CTL_INT,      FS_LEASES,              "leases-enable" },
-       { CTL_INT,      FS_DIR_NOTIFY,          "dir-notify-enable" },
-       { CTL_INT,      FS_LEASE_TIME,          "lease-break-time" },
-       { CTL_DIR,      FS_DQSTATS,             "quota",        bin_fs_quota_table },
-       { CTL_DIR,      FS_XFS,                 "xfs",          bin_fs_xfs_table },
-       { CTL_ULONG,    FS_AIO_NR,              "aio-nr" },
-       { CTL_ULONG,    FS_AIO_MAX_NR,          "aio-max-nr" },
-       { CTL_DIR,      FS_INOTIFY,             "inotify",      bin_inotify_table },
-       { CTL_DIR,      FS_OCFS2,               "ocfs2",        bin_fs_ocfs2_table },
-       { CTL_INT,      KERN_SETUID_DUMPABLE,   "suid_dumpable" },
-       {}
-};
-
-static const struct bin_table bin_ipmi_table[] = {
-       { CTL_INT,      DEV_IPMI_POWEROFF_POWERCYCLE,   "poweroff_powercycle" },
-       {}
-};
-
-static const struct bin_table bin_mac_hid_files[] = {
-       /* DEV_MAC_HID_KEYBOARD_SENDS_LINUX_KEYCODES unused */
-       /* DEV_MAC_HID_KEYBOARD_LOCK_KEYCODES unused */
-       { CTL_INT,      DEV_MAC_HID_MOUSE_BUTTON_EMULATION,     "mouse_button_emulation" },
-       { CTL_INT,      DEV_MAC_HID_MOUSE_BUTTON2_KEYCODE,      "mouse_button2_keycode" },
-       { CTL_INT,      DEV_MAC_HID_MOUSE_BUTTON3_KEYCODE,      "mouse_button3_keycode" },
-       /* DEV_MAC_HID_ADB_MOUSE_SENDS_KEYCODES unused */
-       {}
-};
-
-static const struct bin_table bin_raid_table[] = {
-       { CTL_INT,      DEV_RAID_SPEED_LIMIT_MIN,       "speed_limit_min" },
-       { CTL_INT,      DEV_RAID_SPEED_LIMIT_MAX,       "speed_limit_max" },
-       {}
-};
-
-static const struct bin_table bin_scsi_table[] = {
-       { CTL_INT, DEV_SCSI_LOGGING_LEVEL, "logging_level" },
-       {}
-};
-
-static const struct bin_table bin_dev_table[] = {
-       /* DEV_CDROM    "cdrom" no longer used */
-       /* DEV_HWMON unused */
-       /* DEV_PARPORT  "parport" no longer used */
-       { CTL_DIR,      DEV_RAID,       "raid",         bin_raid_table },
-       { CTL_DIR,      DEV_MAC_HID,    "mac_hid",      bin_mac_hid_files },
-       { CTL_DIR,      DEV_SCSI,       "scsi",         bin_scsi_table },
-       { CTL_DIR,      DEV_IPMI,       "ipmi",         bin_ipmi_table },
-       {}
-};
-
-static const struct bin_table bin_bus_isa_table[] = {
-       { CTL_INT,      BUS_ISA_MEM_BASE,       "membase" },
-       { CTL_INT,      BUS_ISA_PORT_BASE,      "portbase" },
-       { CTL_INT,      BUS_ISA_PORT_SHIFT,     "portshift" },
-       {}
-};
-
-static const struct bin_table bin_bus_table[] = {
-       { CTL_DIR,      CTL_BUS_ISA,    "isa",  bin_bus_isa_table },
-       {}
-};
-
-
-static const struct bin_table bin_s390dbf_table[] = {
-       { CTL_INT,      5678 /* CTL_S390DBF_STOPPABLE */, "debug_stoppable" },
-       { CTL_INT,      5679 /* CTL_S390DBF_ACTIVE */,    "debug_active" },
-       {}
-};
-
-static const struct bin_table bin_sunrpc_table[] = {
-       /* CTL_RPCDEBUG "rpc_debug"  no longer used */
-       /* CTL_NFSDEBUG "nfs_debug"  no longer used */
-       /* CTL_NFSDDEBUG "nfsd_debug" no longer used  */
-       /* CTL_NLMDEBUG "nlm_debug" no longer used */
-
-       { CTL_INT,      CTL_SLOTTABLE_UDP,      "udp_slot_table_entries" },
-       { CTL_INT,      CTL_SLOTTABLE_TCP,      "tcp_slot_table_entries" },
-       { CTL_INT,      CTL_MIN_RESVPORT,       "min_resvport" },
-       { CTL_INT,      CTL_MAX_RESVPORT,       "max_resvport" },
-       {}
-};
-
-static const struct bin_table bin_pm_table[] = {
-       /* frv specific */
-       /* 1 == CTL_PM_SUSPEND  "suspend"  no longer used" */
-       { CTL_INT,      2 /* CTL_PM_CMODE */,           "cmode" },
-       { CTL_INT,      3 /* CTL_PM_P0 */,              "p0" },
-       { CTL_INT,      4 /* CTL_PM_CM */,              "cm" },
-       {}
-};
-
-static const struct bin_table bin_root_table[] = {
-       { CTL_DIR,      CTL_KERN,       "kernel",       bin_kern_table },
-       { CTL_DIR,      CTL_VM,         "vm",           bin_vm_table },
-       { CTL_DIR,      CTL_NET,        "net",          bin_net_table },
-       /* CTL_PROC not used */
-       { CTL_DIR,      CTL_FS,         "fs",           bin_fs_table },
-       /* CTL_DEBUG "debug" no longer used */
-       { CTL_DIR,      CTL_DEV,        "dev",          bin_dev_table },
-       { CTL_DIR,      CTL_BUS,        "bus",          bin_bus_table },
-       { CTL_DIR,      CTL_ABI,        "abi" },
-       /* CTL_CPU not used */
-       /* CTL_ARLAN "arlan" no longer used */
-       { CTL_DIR,      CTL_S390DBF,    "s390dbf",      bin_s390dbf_table },
-       { CTL_DIR,      CTL_SUNRPC,     "sunrpc",       bin_sunrpc_table },
-       { CTL_DIR,      CTL_PM,         "pm",           bin_pm_table },
-       {}
-};
-
-static ssize_t bin_dir(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       return -ENOTDIR;
-}
-
-
-static ssize_t bin_string(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       ssize_t result, copied = 0;
-
-       if (oldval && oldlen) {
-               char __user *lastp;
-               loff_t pos = 0;
-               int ch;
-
-               result = vfs_read(file, oldval, oldlen, &pos);
-               if (result < 0)
-                       goto out;
-
-               copied = result;
-               lastp = oldval + copied - 1;
-
-               result = -EFAULT;
-               if (get_user(ch, lastp))
-                       goto out;
-
-               /* Trim off the trailing newline */
-               if (ch == '\n') {
-                       result = -EFAULT;
-                       if (put_user('\0', lastp))
-                               goto out;
-                       copied -= 1;
-               }
-       }
-
-       if (newval && newlen) {
-               loff_t pos = 0;
-
-               result = vfs_write(file, newval, newlen, &pos);
-               if (result < 0)
-                       goto out;
-       }
-
-       result = copied;
-out:
-       return result;
-}
-
-static ssize_t bin_intvec(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       ssize_t copied = 0;
-       char *buffer;
-       ssize_t result;
-
-       result = -ENOMEM;
-       buffer = kmalloc(BUFSZ, GFP_KERNEL);
-       if (!buffer)
-               goto out;
-
-       if (oldval && oldlen) {
-               unsigned __user *vec = oldval;
-               size_t length = oldlen / sizeof(*vec);
-               char *str, *end;
-               int i;
-               loff_t pos = 0;
-
-               result = kernel_read(file, buffer, BUFSZ - 1, &pos);
-               if (result < 0)
-                       goto out_kfree;
-
-               str = buffer;
-               end = str + result;
-               *end++ = '\0';
-               for (i = 0; i < length; i++) {
-                       unsigned long value;
-
-                       value = simple_strtoul(str, &str, 10);
-                       while (isspace(*str))
-                               str++;
-                       
-                       result = -EFAULT;
-                       if (put_user(value, vec + i))
-                               goto out_kfree;
-
-                       copied += sizeof(*vec);
-                       if (!isdigit(*str))
-                               break;
-               }
-       }
-
-       if (newval && newlen) {
-               unsigned __user *vec = newval;
-               size_t length = newlen / sizeof(*vec);
-               char *str, *end;
-               int i;
-               loff_t pos = 0;
-
-               str = buffer;
-               end = str + BUFSZ;
-               for (i = 0; i < length; i++) {
-                       unsigned long value;
-
-                       result = -EFAULT;
-                       if (get_user(value, vec + i))
-                               goto out_kfree;
-
-                       str += scnprintf(str, end - str, "%lu\t", value);
-               }
-
-               result = kernel_write(file, buffer, str - buffer, &pos);
-               if (result < 0)
-                       goto out_kfree;
-       }
-       result = copied;
-out_kfree:
-       kfree(buffer);
-out:
-       return result;
-}
-
-static ssize_t bin_ulongvec(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       ssize_t copied = 0;
-       char *buffer;
-       ssize_t result;
-
-       result = -ENOMEM;
-       buffer = kmalloc(BUFSZ, GFP_KERNEL);
-       if (!buffer)
-               goto out;
-
-       if (oldval && oldlen) {
-               unsigned long __user *vec = oldval;
-               size_t length = oldlen / sizeof(*vec);
-               char *str, *end;
-               int i;
-               loff_t pos = 0;
-
-               result = kernel_read(file, buffer, BUFSZ - 1, &pos);
-               if (result < 0)
-                       goto out_kfree;
-
-               str = buffer;
-               end = str + result;
-               *end++ = '\0';
-               for (i = 0; i < length; i++) {
-                       unsigned long value;
-
-                       value = simple_strtoul(str, &str, 10);
-                       while (isspace(*str))
-                               str++;
-                       
-                       result = -EFAULT;
-                       if (put_user(value, vec + i))
-                               goto out_kfree;
-
-                       copied += sizeof(*vec);
-                       if (!isdigit(*str))
-                               break;
-               }
-       }
-
-       if (newval && newlen) {
-               unsigned long __user *vec = newval;
-               size_t length = newlen / sizeof(*vec);
-               char *str, *end;
-               int i;
-               loff_t pos = 0;
-
-               str = buffer;
-               end = str + BUFSZ;
-               for (i = 0; i < length; i++) {
-                       unsigned long value;
-
-                       result = -EFAULT;
-                       if (get_user(value, vec + i))
-                               goto out_kfree;
-
-                       str += scnprintf(str, end - str, "%lu\t", value);
-               }
-
-               result = kernel_write(file, buffer, str - buffer, &pos);
-               if (result < 0)
-                       goto out_kfree;
-       }
-       result = copied;
-out_kfree:
-       kfree(buffer);
-out:
-       return result;
-}
-
-static ssize_t bin_uuid(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       ssize_t result, copied = 0;
-
-       /* Only supports reads */
-       if (oldval && oldlen) {
-               char buf[UUID_STRING_LEN + 1];
-               uuid_t uuid;
-               loff_t pos = 0;
-
-               result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
-               if (result < 0)
-                       goto out;
-
-               buf[result] = '\0';
-
-               result = -EIO;
-               if (uuid_parse(buf, &uuid))
-                       goto out;
-
-               if (oldlen > 16)
-                       oldlen = 16;
-
-               result = -EFAULT;
-               if (copy_to_user(oldval, &uuid, oldlen))
-                       goto out;
-
-               copied = oldlen;
-       }
-       result = copied;
-out:
-       return result;
-}
-
-static ssize_t bin_dn_node_address(struct file *file,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       ssize_t result, copied = 0;
-
-       if (oldval && oldlen) {
-               char buf[15], *nodep;
-               unsigned long area, node;
-               __le16 dnaddr;
-               loff_t pos = 0;
-
-               result = kernel_read(file, buf, sizeof(buf) - 1, &pos);
-               if (result < 0)
-                       goto out;
-
-               buf[result] = '\0';
-
-               /* Convert the decnet address to binary */
-               result = -EIO;
-               nodep = strchr(buf, '.');
-               if (!nodep)
-                       goto out;
-               ++nodep;
-
-               area = simple_strtoul(buf, NULL, 10);
-               node = simple_strtoul(nodep, NULL, 10);
-
-               result = -EIO;
-               if ((area > 63)||(node > 1023))
-                       goto out;
-
-               dnaddr = cpu_to_le16((area << 10) | node);
-
-               result = -EFAULT;
-               if (put_user(dnaddr, (__le16 __user *)oldval))
-                       goto out;
-
-               copied = sizeof(dnaddr);
-       }
-
-       if (newval && newlen) {
-               __le16 dnaddr;
-               char buf[15];
-               int len;
-               loff_t pos = 0;
-
-               result = -EINVAL;
-               if (newlen != sizeof(dnaddr))
-                       goto out;
-
-               result = -EFAULT;
-               if (get_user(dnaddr, (__le16 __user *)newval))
-                       goto out;
-
-               len = scnprintf(buf, sizeof(buf), "%hu.%hu",
-                               le16_to_cpu(dnaddr) >> 10,
-                               le16_to_cpu(dnaddr) & 0x3ff);
-
-               result = kernel_write(file, buf, len, &pos);
-               if (result < 0)
-                       goto out;
-       }
-
-       result = copied;
-out:
-       return result;
-}
-
-static const struct bin_table *get_sysctl(const int *name, int nlen, char *path)
-{
-       const struct bin_table *table = &bin_root_table[0];
-       int ctl_name;
-
-       /* The binary sysctl tables have a small maximum depth so
-        * there is no danger of overflowing our path as it PATH_MAX
-        * bytes long.
-        */
-       memcpy(path, "sys/", 4);
-       path += 4;
-
-repeat:
-       if (!nlen)
-               return ERR_PTR(-ENOTDIR);
-       ctl_name = *name;
-       name++;
-       nlen--;
-       for ( ; table->convert; table++) {
-               int len = 0;
-
-               /*
-                * For a wild card entry map from ifindex to network
-                * device name.
-                */
-               if (!table->ctl_name) {
-#ifdef CONFIG_NET
-                       struct net *net = current->nsproxy->net_ns;
-                       struct net_device *dev;
-                       dev = dev_get_by_index(net, ctl_name);
-                       if (dev) {
-                               len = strlen(dev->name);
-                               memcpy(path, dev->name, len);
-                               dev_put(dev);
-                       }
-#endif
-               /* Use the well known sysctl number to proc name mapping */
-               } else if (ctl_name == table->ctl_name) {
-                       len = strlen(table->procname);
-                       memcpy(path, table->procname, len);
-               }
-               if (len) {
-                       path += len;
-                       if (table->child) {
-                               *path++ = '/';
-                               table = table->child;
-                               goto repeat;
-                       }
-                       *path = '\0';
-                       return table;
-               }
-       }
-       return ERR_PTR(-ENOTDIR);
-}
-
-static char *sysctl_getname(const int *name, int nlen, const struct bin_table **tablep)
-{
-       char *tmp, *result;
-
-       result = ERR_PTR(-ENOMEM);
-       tmp = __getname();
-       if (tmp) {
-               const struct bin_table *table = get_sysctl(name, nlen, tmp);
-               result = tmp;
-               *tablep = table;
-               if (IS_ERR(table)) {
-                       __putname(tmp);
-                       result = ERR_CAST(table);
-               }
-       }
-       return result;
-}
-
-static ssize_t binary_sysctl(const int *name, int nlen,
-       void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
-{
-       const struct bin_table *table = NULL;
-       struct vfsmount *mnt;
-       struct file *file;
-       ssize_t result;
-       char *pathname;
-       int flags;
-
-       pathname = sysctl_getname(name, nlen, &table);
-       result = PTR_ERR(pathname);
-       if (IS_ERR(pathname))
-               goto out;
-
-       /* How should the sysctl be accessed? */
-       if (oldval && oldlen && newval && newlen) {
-               flags = O_RDWR;
-       } else if (newval && newlen) {
-               flags = O_WRONLY;
-       } else if (oldval && oldlen) {
-               flags = O_RDONLY;
-       } else {
-               result = 0;
-               goto out_putname;
-       }
-
-       mnt = task_active_pid_ns(current)->proc_mnt;
-       file = file_open_root(mnt->mnt_root, mnt, pathname, flags, 0);
-       result = PTR_ERR(file);
-       if (IS_ERR(file))
-               goto out_putname;
-
-       result = table->convert(file, oldval, oldlen, newval, newlen);
-
-       fput(file);
-out_putname:
-       __putname(pathname);
-out:
-       return result;
-}
-
-
-#else /* CONFIG_SYSCTL_SYSCALL */
-
 static ssize_t binary_sysctl(const int *name, int nlen,
        void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
 {
        return -ENOSYS;
 }
 
-#endif /* CONFIG_SYSCTL_SYSCALL */
-
-
 static void deprecated_sysctl_warning(const int *name, int nlen)
 {
        int i;