Do not check for old sysctl enums

Assume that sysctl enums defined since linux v2.6 are always defined,
with a signle exception: check for CTL_PROC which definition was removed
in v2.6.18 and restored later in v2.6.23.

* configure.ac (AC_CHECK_DECLS): Remove old constants.
* xlat/sysctl_kern.in: Mark constants older than KERN_PRINTK_RATELIMIT
as unconditional.
* xlat/sysctl_net.in: Mark constants older than NET_LLC
as unconditional.
* xlat/sysctl_net_core.in: Mark constants older than NET_CORE_BUDGET
as unconditional.
* xlat/sysctl_net_ipv4.in: Mark constants older than
NET_IPV4_IGMP_MAX_MSF as unconditional.
* xlat/sysctl_net_ipv4_conf.in: Mark constants older than
NET_IPV4_CONF_FORCE_IGMP_VERSION as unconditional.
* xlat/sysctl_net_ipv4_route.in: Mark constants older than
NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS as unconditional.
* xlat/sysctl_net_ipv6.in: Mark constants older than
NET_IPV6_MLD_MAX_MSF as unconditional.
* xlat/sysctl_net_ipv6_route.in: Mark constants older than
NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS as unconditional.
* xlat/sysctl_net_unix.in: Mark all constants as unconditional.
* xlat/sysctl_root.in: Mark constants older than CTL_ARLAN
as unconditional.
* xlat/sysctl_vm.in: Mark constants older than VM_MAX_MAP_COUNT
as unconditional.

diff --git a/configure.ac b/configure.ac
index 7dfa1d11fc4281f570f5a25fc241f9f139b31c24..9528a7f26e92d1aff0bbc57cd8b9b25bfd0886cc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -493,70 +493,12 @@ AC_CHECK_DECLS(m4_normalize([
 ]),,, [#include <linux/loop.h>])
 
 AC_CHECK_DECLS(m4_normalize([
-       CTL_KERN,
-       CTL_VM,
-       CTL_NET,
        CTL_PROC,
-       CTL_FS,
-       CTL_DEBUG,
-       CTL_DEV,
-       CTL_BUS,
-       CTL_ABI,
-       CTL_CPU,
        CTL_ARLAN,
        CTL_S390DBF,
        CTL_SUNRPC,
        CTL_PM,
        CTL_FRV,
-       KERN_OSTYPE,
-       KERN_OSRELEASE,
-       KERN_OSREV,
-       KERN_VERSION,
-       KERN_SECUREMASK,
-       KERN_PROF,
-       KERN_NODENAME,
-       KERN_DOMAINNAME,
-       KERN_PANIC,
-       KERN_REALROOTDEV,
-       KERN_SPARC_REBOOT,
-       KERN_CTLALTDEL,
-       KERN_PRINTK,
-       KERN_NAMETRANS,
-       KERN_PPC_HTABRECLAIM,
-       KERN_PPC_ZEROPAGED,
-       KERN_PPC_POWERSAVE_NAP,
-       KERN_MODPROBE,
-       KERN_SG_BIG_BUFF,
-       KERN_ACCT,
-       KERN_PPC_L2CR,
-       KERN_RTSIGNR,
-       KERN_RTSIGMAX,
-       KERN_SHMMAX,
-       KERN_MSGMAX,
-       KERN_MSGMNB,
-       KERN_MSGPOOL,
-       KERN_SYSRQ,
-       KERN_MAX_THREADS,
-       KERN_RANDOM,
-       KERN_SHMALL,
-       KERN_MSGMNI,
-       KERN_SEM,
-       KERN_SPARC_STOP_A,
-       KERN_SHMMNI,
-       KERN_OVERFLOWUID,
-       KERN_OVERFLOWGID,
-       KERN_SHMPATH,
-       KERN_HOTPLUG,
-       KERN_IEEE_EMULATION_WARNINGS,
-       KERN_S390_USER_DEBUG_LOGGING,
-       KERN_CORE_USES_PID,
-       KERN_TAINTED,
-       KERN_CADPID,
-       KERN_PIDMAX,
-       KERN_CORE_PATTERN,
-       KERN_PANIC_ON_OOPS,
-       KERN_HPPA_PWRSW,
-       KERN_HPPA_UNALIGNED,
        KERN_PRINTK_RATELIMIT,
        KERN_PRINTK_RATELIMIT_BURST,
        KERN_PTY,
@@ -574,118 +516,15 @@ AC_CHECK_DECLS(m4_normalize([
        KERN_MAX_LOCK_DEPTH,
        KERN_NMI_WATCHDOG,
        KERN_PANIC_ON_NMI,
-       NET_CORE,
-       NET_ETHER,
-       NET_802,
-       NET_UNIX,
-       NET_IPV4,
-       NET_IPX,
-       NET_ATALK,
-       NET_NETROM,
-       NET_AX25,
-       NET_BRIDGE,
-       NET_ROSE,
-       NET_IPV6,
-       NET_X25,
-       NET_TR,
-       NET_DECNET,
-       NET_ECONET,
-       NET_SCTP,
        NET_LLC,
        NET_NETFILTER,
        NET_DCCP,
        NET_IRDA,
-       NET_CORE_WMEM_MAX,
-       NET_CORE_RMEM_MAX,
-       NET_CORE_WMEM_DEFAULT,
-       NET_CORE_RMEM_DEFAULT,
        NET_CORE_DESTROY_DELAY,
-       NET_CORE_MAX_BACKLOG,
-       NET_CORE_FASTROUTE,
-       NET_CORE_MSG_COST,
-       NET_CORE_MSG_BURST,
-       NET_CORE_OPTMEM_MAX,
-       NET_CORE_HOT_LIST_LENGTH,
-       NET_CORE_DIVERT_VERSION,
-       NET_CORE_NO_CONG_THRESH,
-       NET_CORE_NO_CONG,
-       NET_CORE_LO_CONG,
-       NET_CORE_MOD_CONG,
-       NET_CORE_DEV_WEIGHT,
-       NET_CORE_SOMAXCONN,
        NET_CORE_BUDGET,
        NET_CORE_AEVENT_ETIME,
        NET_CORE_AEVENT_RSEQTH,
        NET_CORE_WARNINGS,
-       NET_IPV4_FORWARD,
-       NET_IPV4_DYNADDR,
-       NET_IPV4_CONF,
-       NET_IPV4_NEIGH,
-       NET_IPV4_ROUTE,
-       NET_IPV4_FIB_HASH,
-       NET_IPV4_NETFILTER,
-       NET_IPV4_TCP_TIMESTAMPS,
-       NET_IPV4_TCP_WINDOW_SCALING,
-       NET_IPV4_TCP_SACK,
-       NET_IPV4_TCP_RETRANS_COLLAPSE,
-       NET_IPV4_DEFAULT_TTL,
-       NET_IPV4_AUTOCONFIG,
-       NET_IPV4_NO_PMTU_DISC,
-       NET_IPV4_TCP_SYN_RETRIES,
-       NET_IPV4_IPFRAG_HIGH_THRESH,
-       NET_IPV4_IPFRAG_LOW_THRESH,
-       NET_IPV4_IPFRAG_TIME,
-       NET_IPV4_TCP_MAX_KA_PROBES,
-       NET_IPV4_TCP_KEEPALIVE_TIME,
-       NET_IPV4_TCP_KEEPALIVE_PROBES,
-       NET_IPV4_TCP_RETRIES1,
-       NET_IPV4_TCP_RETRIES2,
-       NET_IPV4_TCP_FIN_TIMEOUT,
-       NET_IPV4_IP_MASQ_DEBUG,
-       NET_TCP_SYNCOOKIES,
-       NET_TCP_STDURG,
-       NET_TCP_RFC1337,
-       NET_TCP_SYN_TAILDROP,
-       NET_TCP_MAX_SYN_BACKLOG,
-       NET_IPV4_LOCAL_PORT_RANGE,
-       NET_IPV4_ICMP_ECHO_IGNORE_ALL,
-       NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS,
-       NET_IPV4_ICMP_SOURCEQUENCH_RATE,
-       NET_IPV4_ICMP_DESTUNREACH_RATE,
-       NET_IPV4_ICMP_TIMEEXCEED_RATE,
-       NET_IPV4_ICMP_PARAMPROB_RATE,
-       NET_IPV4_ICMP_ECHOREPLY_RATE,
-       NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES,
-       NET_IPV4_IGMP_MAX_MEMBERSHIPS,
-       NET_TCP_TW_RECYCLE,
-       NET_IPV4_ALWAYS_DEFRAG,
-       NET_IPV4_TCP_KEEPALIVE_INTVL,
-       NET_IPV4_INET_PEER_THRESHOLD,
-       NET_IPV4_INET_PEER_MINTTL,
-       NET_IPV4_INET_PEER_MAXTTL,
-       NET_IPV4_INET_PEER_GC_MINTIME,
-       NET_IPV4_INET_PEER_GC_MAXTIME,
-       NET_TCP_ORPHAN_RETRIES,
-       NET_TCP_ABORT_ON_OVERFLOW,
-       NET_TCP_SYNACK_RETRIES,
-       NET_TCP_MAX_ORPHANS,
-       NET_TCP_MAX_TW_BUCKETS,
-       NET_TCP_FACK,
-       NET_TCP_REORDERING,
-       NET_TCP_ECN,
-       NET_TCP_DSACK,
-       NET_TCP_MEM,
-       NET_TCP_WMEM,
-       NET_TCP_RMEM,
-       NET_TCP_APP_WIN,
-       NET_TCP_ADV_WIN_SCALE,
-       NET_IPV4_NONLOCAL_BIND,
-       NET_IPV4_ICMP_RATELIMIT,
-       NET_IPV4_ICMP_RATEMASK,
-       NET_TCP_TW_REUSE,
-       NET_TCP_FRTO,
-       NET_TCP_LOW_LATENCY,
-       NET_IPV4_IPFRAG_SECRET_INTERVAL,
        NET_IPV4_IGMP_MAX_MSF,
        NET_TCP_NO_METRICS_SAVE,
        NET_TCP_DEFAULT_WIN_SCALE,
@@ -709,83 +548,15 @@ AC_CHECK_DECLS(m4_normalize([
        NET_TCP_ALLOWED_CONG_CONTROL,
        NET_TCP_MAX_SSTHRESH,
        NET_TCP_FRTO_RESPONSE,
-       NET_IPV4_ROUTE_FLUSH,
-       NET_IPV4_ROUTE_MIN_DELAY,
-       NET_IPV4_ROUTE_MAX_DELAY,
-       NET_IPV4_ROUTE_GC_THRESH,
-       NET_IPV4_ROUTE_MAX_SIZE,
-       NET_IPV4_ROUTE_GC_MIN_INTERVAL,
-       NET_IPV4_ROUTE_GC_TIMEOUT,
-       NET_IPV4_ROUTE_GC_INTERVAL,
-       NET_IPV4_ROUTE_REDIRECT_LOAD,
-       NET_IPV4_ROUTE_REDIRECT_NUMBER,
-       NET_IPV4_ROUTE_REDIRECT_SILENCE,
-       NET_IPV4_ROUTE_ERROR_COST,
-       NET_IPV4_ROUTE_ERROR_BURST,
-       NET_IPV4_ROUTE_GC_ELASTICITY,
-       NET_IPV4_ROUTE_MTU_EXPIRES,
-       NET_IPV4_ROUTE_MIN_PMTU,
-       NET_IPV4_ROUTE_MIN_ADVMSS,
-       NET_IPV4_ROUTE_SECRET_INTERVAL,
        NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS,
-       NET_IPV4_CONF_FORWARDING,
-       NET_IPV4_CONF_MC_FORWARDING,
-       NET_IPV4_CONF_PROXY_ARP,
-       NET_IPV4_CONF_ACCEPT_REDIRECTS,
-       NET_IPV4_CONF_SECURE_REDIRECTS,
-       NET_IPV4_CONF_SEND_REDIRECTS,
-       NET_IPV4_CONF_SHARED_MEDIA,
-       NET_IPV4_CONF_RP_FILTER,
-       NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE,
-       NET_IPV4_CONF_BOOTP_RELAY,
-       NET_IPV4_CONF_LOG_MARTIANS,
-       NET_IPV4_CONF_TAG,
-       NET_IPV4_CONF_ARPFILTER,
-       NET_IPV4_CONF_MEDIUM_ID,
-       NET_IPV4_CONF_NOXFRM,
-       NET_IPV4_CONF_NOPOLICY,
        NET_IPV4_CONF_FORCE_IGMP_VERSION,
        NET_IPV4_CONF_ARP_ANNOUNCE,
        NET_IPV4_CONF_ARP_IGNORE,
        NET_IPV4_CONF_PROMOTE_SECONDARIES,
        NET_IPV4_CONF_ARP_ACCEPT,
        NET_IPV4_CONF_ARP_NOTIFY,
-       NET_IPV6_CONF,
-       NET_IPV6_NEIGH,
-       NET_IPV6_ROUTE,
-       NET_IPV6_ICMP,
-       NET_IPV6_BINDV6ONLY,
-       NET_IPV6_IP6FRAG_HIGH_THRESH,
-       NET_IPV6_IP6FRAG_LOW_THRESH,
-       NET_IPV6_IP6FRAG_TIME,
-       NET_IPV6_IP6FRAG_SECRET_INTERVAL,
        NET_IPV6_MLD_MAX_MSF,
-       NET_IPV6_ROUTE_FLUSH,
-       NET_IPV6_ROUTE_GC_THRESH,
-       NET_IPV6_ROUTE_MAX_SIZE,
-       NET_IPV6_ROUTE_GC_MIN_INTERVAL,
-       NET_IPV6_ROUTE_GC_TIMEOUT,
-       NET_IPV6_ROUTE_GC_INTERVAL,
-       NET_IPV6_ROUTE_GC_ELASTICITY,
-       NET_IPV6_ROUTE_MTU_EXPIRES,
-       NET_IPV6_ROUTE_MIN_ADVMSS,
        NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS,
-       NET_UNIX_DESTROY_DELAY,
-       NET_UNIX_DELETE_DELAY,
-       NET_UNIX_MAX_DGRAM_QLEN,
-       VM_OVERCOMMIT_MEMORY,
-       VM_PAGE_CLUSTER,
-       VM_DIRTY_BACKGROUND,
-       VM_DIRTY_RATIO,
-       VM_DIRTY_WB_CS,
-       VM_DIRTY_EXPIRE_CS,
-       VM_NR_PDFLUSH_THREADS,
-       VM_OVERCOMMIT_RATIO,
-       VM_PAGEBUF,
-       VM_HUGETLB_PAGES,
-       VM_SWAPPINESS,
-       VM_LOWMEM_RESERVE_RATIO,
-       VM_MIN_FREE_KBYTES,
        VM_MAX_MAP_COUNT,
        VM_LAPTOP_MODE,
        VM_BLOCK_DUMP,

diff --git a/xlat/sysctl_kern.in b/xlat/sysctl_kern.in
index 93ebfe2800f706ddad2bd28f673d8fdd582a1de7..b0568cea198af92a4df8047396747666329983fb 100644 (file)
--- a/xlat/sysctl_kern.in
+++ b/xlat/sysctl_kern.in
@@ -1,3 +1,4 @@
+#unconditional
 KERN_OSTYPE
 KERN_OSRELEASE
 KERN_OSREV
@@ -47,6 +48,7 @@ KERN_CORE_PATTERN
 KERN_PANIC_ON_OOPS
 KERN_HPPA_PWRSW
 KERN_HPPA_UNALIGNED
+#conditional
 KERN_PRINTK_RATELIMIT
 KERN_PRINTK_RATELIMIT_BURST
 KERN_PTY

diff --git a/xlat/sysctl_net.in b/xlat/sysctl_net.in
index 4e64a46c1e680b1a1836bbeaf1ca8d81e0b5c825..cb08d919afb80c9e308ae4df91414b636ef7c94e 100644 (file)
--- a/xlat/sysctl_net.in
+++ b/xlat/sysctl_net.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_CORE
 NET_ETHER
 NET_802
@@ -15,6 +16,7 @@ NET_TR
 NET_DECNET
 NET_ECONET
 NET_SCTP
+#conditional
 NET_LLC
 NET_NETFILTER
 NET_DCCP

diff --git a/xlat/sysctl_net_core.in b/xlat/sysctl_net_core.in
index d29dc5022270a510e6631fb289a04c6e853f9433..054fd9fa9488880259d3c2e4e54d46d3149641da 100644 (file)
--- a/xlat/sysctl_net_core.in
+++ b/xlat/sysctl_net_core.in
@@ -1,8 +1,8 @@
+#unconditional
 NET_CORE_WMEM_MAX
 NET_CORE_RMEM_MAX
 NET_CORE_WMEM_DEFAULT
 NET_CORE_RMEM_DEFAULT
-NET_CORE_DESTROY_DELAY
 NET_CORE_MAX_BACKLOG
 NET_CORE_FASTROUTE
 NET_CORE_MSG_COST
@@ -16,6 +16,8 @@ NET_CORE_LO_CONG
 NET_CORE_MOD_CONG
 NET_CORE_DEV_WEIGHT
 NET_CORE_SOMAXCONN
+#conditional
+NET_CORE_DESTROY_DELAY
 NET_CORE_BUDGET
 NET_CORE_AEVENT_ETIME
 NET_CORE_AEVENT_RSEQTH

diff --git a/xlat/sysctl_net_ipv4.in b/xlat/sysctl_net_ipv4.in
index d700cc9bc5cc7124d672c37523068f8c1edf8709..8f452e85e67a31cb7bed5d4db85ca4caba305c2e 100644 (file)
--- a/xlat/sysctl_net_ipv4.in
+++ b/xlat/sysctl_net_ipv4.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_IPV4_FORWARD
 NET_IPV4_DYNADDR
 NET_IPV4_CONF
@@ -67,6 +68,7 @@ NET_TCP_TW_REUSE
 NET_TCP_FRTO
 NET_TCP_LOW_LATENCY
 NET_IPV4_IPFRAG_SECRET_INTERVAL
+#conditional
 NET_IPV4_IGMP_MAX_MSF
 NET_TCP_NO_METRICS_SAVE
 NET_TCP_DEFAULT_WIN_SCALE

diff --git a/xlat/sysctl_net_ipv4_conf.in b/xlat/sysctl_net_ipv4_conf.in
index 03ce52797f376953da28aa158c71b23731db034f..be94bd224e77d30cfda266d137d9b7ffef8272c5 100644 (file)
--- a/xlat/sysctl_net_ipv4_conf.in
+++ b/xlat/sysctl_net_ipv4_conf.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_IPV4_CONF_FORWARDING
 NET_IPV4_CONF_MC_FORWARDING
 NET_IPV4_CONF_PROXY_ARP
@@ -14,6 +15,7 @@ NET_IPV4_CONF_ARPFILTER
 NET_IPV4_CONF_MEDIUM_ID
 NET_IPV4_CONF_NOXFRM
 NET_IPV4_CONF_NOPOLICY
+#conditional
 NET_IPV4_CONF_FORCE_IGMP_VERSION
 NET_IPV4_CONF_ARP_ANNOUNCE
 NET_IPV4_CONF_ARP_IGNORE

diff --git a/xlat/sysctl_net_ipv4_route.in b/xlat/sysctl_net_ipv4_route.in
index fb06e9cbb02073171fc2aaa0b6fa89f5446a6924..a77cf41725e7ad36dae44426303c21742544b07a 100644 (file)
--- a/xlat/sysctl_net_ipv4_route.in
+++ b/xlat/sysctl_net_ipv4_route.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_IPV4_ROUTE_FLUSH
 NET_IPV4_ROUTE_MIN_DELAY
 NET_IPV4_ROUTE_MAX_DELAY
@@ -16,4 +17,5 @@ NET_IPV4_ROUTE_MTU_EXPIRES
 NET_IPV4_ROUTE_MIN_PMTU
 NET_IPV4_ROUTE_MIN_ADVMSS
 NET_IPV4_ROUTE_SECRET_INTERVAL
+#conditional
 NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS

diff --git a/xlat/sysctl_net_ipv6.in b/xlat/sysctl_net_ipv6.in
index 75e64ec18e87089c1bd4890d73a3d151cbeb0bed..711dbb52199f4fea24021146c1189b248b9e8ff2 100644 (file)
--- a/xlat/sysctl_net_ipv6.in
+++ b/xlat/sysctl_net_ipv6.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_IPV6_CONF
 NET_IPV6_NEIGH
 NET_IPV6_ROUTE
@@ -7,4 +8,5 @@ NET_IPV6_IP6FRAG_HIGH_THRESH
 NET_IPV6_IP6FRAG_LOW_THRESH
 NET_IPV6_IP6FRAG_TIME
 NET_IPV6_IP6FRAG_SECRET_INTERVAL
+#conditional
 NET_IPV6_MLD_MAX_MSF

diff --git a/xlat/sysctl_net_ipv6_route.in b/xlat/sysctl_net_ipv6_route.in
index 6395edd621a5435923338d2e381bb3d19bff1921..53e3800c2d2838c03492d2acd4c834c4c8955503 100644 (file)
--- a/xlat/sysctl_net_ipv6_route.in
+++ b/xlat/sysctl_net_ipv6_route.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_IPV6_ROUTE_FLUSH
 NET_IPV6_ROUTE_GC_THRESH
 NET_IPV6_ROUTE_MAX_SIZE
@@ -7,4 +8,5 @@ NET_IPV6_ROUTE_GC_INTERVAL
 NET_IPV6_ROUTE_GC_ELASTICITY
 NET_IPV6_ROUTE_MTU_EXPIRES
 NET_IPV6_ROUTE_MIN_ADVMSS
+#conditional
 NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS

diff --git a/xlat/sysctl_net_unix.in b/xlat/sysctl_net_unix.in
index a442feea0f5be4e45c103dab904e630b004c92ad..7440a9289a54d9cb5214b6150e392391df3d4f66 100644 (file)
--- a/xlat/sysctl_net_unix.in
+++ b/xlat/sysctl_net_unix.in
@@ -1,3 +1,4 @@
+#unconditional
 NET_UNIX_DESTROY_DELAY
 NET_UNIX_DELETE_DELAY
 NET_UNIX_MAX_DGRAM_QLEN

diff --git a/xlat/sysctl_root.in b/xlat/sysctl_root.in
index 28bd49acb7518de87fb7b22b9196388efb4ea0e7..670670cc64dc03d0195da502596a3f0770c17b9b 100644 (file)
--- a/xlat/sysctl_root.in
+++ b/xlat/sysctl_root.in
@@ -1,13 +1,15 @@
+#unconditional
 CTL_KERN
 CTL_VM
 CTL_NET
-CTL_PROC
 CTL_FS
 CTL_DEBUG
 CTL_DEV
 CTL_BUS
 CTL_ABI
 CTL_CPU
+#conditional
+CTL_PROC
 CTL_ARLAN
 CTL_S390DBF
 CTL_SUNRPC

diff --git a/xlat/sysctl_vm.in b/xlat/sysctl_vm.in
index 6d476af9ebfcab757c64b380d06479d696d5bb61..3c2b4739a1bc30228645adac2b6d2e828e9e0a76 100644 (file)
--- a/xlat/sysctl_vm.in
+++ b/xlat/sysctl_vm.in
@@ -1,3 +1,4 @@
+#unconditional
 VM_OVERCOMMIT_MEMORY
 VM_PAGE_CLUSTER
 VM_DIRTY_BACKGROUND
@@ -11,6 +12,7 @@ VM_HUGETLB_PAGES
 VM_SWAPPINESS
 VM_LOWMEM_RESERVE_RATIO
 VM_MIN_FREE_KBYTES
+#conditional
 VM_MAX_MAP_COUNT
 VM_LAPTOP_MODE
 VM_BLOCK_DUMP