xlat: update and provide fallback values to sysctl_* xlatsesyr/linux-5.15

* src/xlat/sysctl_kern.in: Remove #(un)conditional, add #value_indexed,
add fallback values.
(KERN_NRINODE, KERN_MAXINODE, KERN_NRFILE, KERN_MAXFILE, KERN_MAXID,
KERN_CAP_BSET, KERN_NFSRNAME, KERN_NFSRADDRS, KERN_JAVA_INTERPRETER,
KERN_JAVA_APPLETVIEWER): New constants.
* src/xlat/sysctl_net.in: Remove #(un)conditional, add #sorted, add
fallback values.
* src/xlat/sysctl_net_core.in: Remove #(un)conditional, add #value_indexed,
add fallback values.
* src/xlat/sysctl_net_ipv4.in: Remove #(un)conditional, replace #sorted
with #value_indexed, add fallback values.
(NET_TCP_WESTWOOD, NET_TCP_VEGAS, NET_TCP_VEGAS_ALPHA, NET_TCP_VEGAS_BETA,
NET_TCP_VEGAS_GAMMA, NET_TCP_BIC, NET_TCP_BIC_FAST_CONVERGENCE,
NET_TCP_BIC_LOW_WINDOW): New constants.
* src/xlat/sysctl_net_ipv4_conf.in: Remove #(un)conditional,
add #value_indexed, add fallback values.
(NET_IPV4_CONF_ACCEPT_LOCAL, NET_IPV4_CONF_SRC_VMARK,
NET_IPV4_CONF_PROXY_ARP_PVLAN): New constants.
* src/xlat/sysctl_net_ipv4_route.in: Remove #(un)conditional,
add #value_indexed, add fallback values.
* src/xlat/sysctl_net_ipv6.in: Remove #(un)conditional, add #sorted,
add fallback values.
* src/xlat/sysctl_net_ipv6_route.in: Remove #(un)conditional,
add #value_indexed, add fallback values.
* src/xlat/sysctl_net_unix.in: Remove #unconditional, add #enum
and #include, add fallback values.
* src/xlat/sysctl_root.in: Remove #(un)conditional, reorder, add #sorted,
add fallback values.
(CTL_INOTIFY. CTL_APPLDATA): New constants.
* src/xlat/sysctl_vm.in: Remove #(un)conditional, add #sorted, add
fallback values.
(VM_UNUSED1, VM_UNUSED2, VM_UNUSED3, VM_UNUSED4, VM_UNUSED5, VM_UNUSED6,
VM_UNUSED7, VM_UNUSED8, VM_UNUSED9, VM_DROP_PAGECACHE,
VM_PERCPU_PAGELIST_FRACTION, VM_ZONE_RECLAIM_MODE, VM_MIN_UNMAPPED,
VM_PANIC_ON_OOM, VM_VDSO_ENABLED, VM_MIN_SLAB, VM_CMM_PAGES,
VM_CMM_TIMED_PAGES, VM_CMM_TIMEOUT): New constants.

11 files changed, 698 insertions, 324 deletions

diff --git a/src/xlat/sysctl_kern.in b/src/xlat/sysctl_kern.in
index 150657bc5..805b06192 100644
--- a/src/xlat/sysctl_kern.in
+++ b/src/xlat/sysctl_kern.in
@@ -1,73 +1,138 @@
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-KERN_PRINTK_RATELIMIT
-KERN_PRINTK_RATELIMIT_BURST
-KERN_PTY
-KERN_NGROUPS_MAX
-KERN_SPARC_SCONS_PWROFF
-KERN_HZ_TIMER
-KERN_UNKNOWN_NMI_PANIC
-KERN_BOOTLOADER_TYPE
-KERN_RANDOMIZE
-KERN_SETUID_DUMPABLE
-KERN_SPIN_RETRY
-KERN_ACPI_VIDEO_FLAGS
-KERN_IA64_UNALIGNED
-KERN_COMPAT_LOG
-KERN_MAX_LOCK_DEPTH
-KERN_NMI_WATCHDOG
-KERN_PANIC_ON_NMI
-KERN_PANIC_ON_WARN
-KERN_PANIC_PRINT
+/* Available since 1.3.57 */
+KERN_OSTYPE		1
+KERN_OSRELEASE		2
+KERN_OSREV		3
+KERN_VERSION		4
+KERN_SECUREMASK		5
+KERN_PROF		6
+KERN_NODENAME		7
+KERN_DOMAINNAME		8
+KERN_NRINODE		9  /* Removed in 2.1.101 */
+KERN_MAXINODE		10 /* Removed in 2.1.101 */
+KERN_NRFILE		11 /* Removed in 2.1.101 */
+KERN_MAXFILE		12 /* Removed in 2.1.101 */
+KERN_MAXID		13
+/* 1.3.58 as KERN_SECURELVL, renamed to KERN_CAP_BSET in 2.3.13pre7 */
+/* Removed in 2.6.25-rc1, 3b7391de */
+KERN_CAP_BSET		14
+/* 1.3.72 */
+KERN_PANIC		15
+/* 1.3.73 */
+KERN_REALROOTDEV	16
+KERN_NFSRNAME		17 /* NFS root name, 1.3.73-2.1.101 */
+KERN_NFSRADDRS		18 /* NFS root addresses, 1.3.73-2.1.101 */
+/* pre2.0.3 */
+KERN_JAVA_INTERPRETER	19 /* path to Java(tm) interpreter, until 2.3.9pre3 */
+KERN_JAVA_APPLETVIEWER	20 /* path to Java(tm) appletviewer, until 2.3.9pre3 */
+/* 2.1.16 */
+KERN_SPARC_REBOOT	21
+/* 2.1.32 */
+KERN_CTLALTDEL		22
+KERN_PRINTK		23
+/* 2.1.43pre1 */
+KERN_NAMETRANS		24
+
+/* KERN_STATINODE	25 - Old, 2.1.43pre1-2.1.101 */
+/* KERN_DENTRY		26 - Old, 2.1.60-2.1.101 */
+/* KERN_MODPROBE		27 - Old, 2.1.90pre */
+/* KERN_KMOD_UNLOAD_DELAY	28 - Old, 2.1.90pre-2.1.99pre1 */
+
+/* 2.1.101 */
+KERN_PPC_HTABRECLAIM	25
+KERN_PPC_ZEROPAGED	26
+/* 2.1.115pre3 */
+KERN_PPC_POWERSAVE_NAP	27
+
+KERN_MODPROBE		28 /* Since 2.1.90pre - was 27 at the time, changed to 28 in 2.1.115pre3, was 29 during 2.1.124pre2-2.1.128 */
+KERN_SG_BIG_BUFF	29 /* Since 2.1.101, was 30 during 2.1.124pre2-2.1.128 */
+
+KERN_ACCT		30 /* Since 2.1.128 */
+KERN_PPC_L2CR		31 /* Since 2.1.124pre2, was 28 at the time, changed to 31 in 2.1.128 */
+
+/* 2.1.132pre3 */
+KERN_RTSIGNR		32
+KERN_RTSIGMAX		33
+
+KERN_SHMMAX		34 /* Was int, changed to long in 2.3.30pre2 */
+KERN_MSGMAX		35
+KERN_MSGMNB		36
+KERN_MSGPOOL		37
+
+KERN_SYSRQ		38 /* Since 2.3.13pre7 */
+KERN_MAX_THREADS	39 /* Was 38 since 2.3.11pre3, changed to 39 in 2.3.13pre7 */
+/* 2.3.16 */
+KERN_RANDOM		40
+/* 2.3.24pre1-2.3.26pre1, 2.3.27pre1 */
+KERN_SHMALL		41
+/* 2.3.27pre4 */
+KERN_MSGMNI		42
+KERN_SEM		43 /* Was int, changed to struct in 2.3.30pre2 */
+/* 2.3.29pre2 */
+KERN_SPARC_STOP_A	44
+/* 2.3.30pre2 */
+KERN_SHMMNI		45
+/* 2.3.39 */
+KERN_OVERFLOWUID	46
+KERN_OVERFLOWGID	47
+/* 2.3.51pre1 */
+KERN_SHMPATH		48
+/* 2.4.0-test5pre4 */
+KERN_HOTPLUG		49
+/* 2.4.3.3, 1a015350 */
+KERN_IEEE_EMULATION_WARNINGS	50
+KERN_S390_USER_DEBUG_LOGGING	51
+/* 2.4.9.9, 1d66e22e */
+KERN_CORE_USES_PID	52
+/* 2.4.10.2, 5bf3be03 */
+KERN_TAINTED		53
+/* 2.4.9.12, dfc52b82 */
+KERN_CADPID		54
+/* 2.5.34, acdc721f */
+KERN_PIDMAX		55
+/* KERN_HUGETLB_PAGE_NUM 56 2.5.36-2.5.37, c9d3808f..a7d2851c  int: Number of available Huge Pages */
+/* 2.5.43, 4108966a */
+KERN_CORE_PATTERN	56
+/* 2.5.68, 7b78878b */
+KERN_PANIC_ON_OOPS	57
+/* 2.6.0-test1, e572d2bc */
+KERN_HPPA_PWRSW		58
+KERN_HPPA_UNALIGNED	59
+/* 2.6.2-rc2, 11a61205 */
+KERN_PRINTK_RATELIMIT	60
+KERN_PRINTK_RATELIMIT_BURST	61
+/* 2.6.4-rc2, 562123b5 */
+KERN_PTY		62
+/* 2.6.4-rc1, 9257eb53 */
+KERN_NGROUPS_MAX	63
+/* 2.6.6-rc2, a7054210 */
+KERN_SPARC_SCONS_PWROFF	64
+/* 2.6.6-rc3, 1bd4c02c */
+KERN_HZ_TIMER		65
+/* 2.6.9-rc1, 7f2b65bd */
+KERN_UNKNOWN_NMI_PANIC	66
+/* 2.6.11-rc2, 9b43aebe */
+KERN_BOOTLOADER_TYPE	67
+/* 2.6.12-rc1, 818bcba5 */
+KERN_RANDOMIZE		68
+/* 2.6.13-rc4, d6e71144 */
+KERN_SETUID_DUMPABLE	69
+/* 2.6.13-rc4, 951f22d5 */
+KERN_SPIN_RETRY		70
+/* 2.6.16-rc5, c255d844 */
+KERN_ACPI_VIDEO_FLAGS	71
+/* 2.6.16-rc6, d2b176ed */
+KERN_IA64_UNALIGNED	72
+/* 2.6.18-rc1, bebfa101 */
+KERN_COMPAT_LOG		73
+/* 2.6.18-rc1, 23f78d4a */
+KERN_MAX_LOCK_DEPTH	74
+/* 2.6.19-rc1, 407984f1 */
+KERN_NMI_WATCHDOG	75
+/* 2.6.19-rc1, 8da5adda */
+KERN_PANIC_ON_NMI	76
+/* 3.19-rc1, 9e3961a097 */
+KERN_PANIC_ON_WARN	77
diff --git a/src/xlat/sysctl_net.in b/src/xlat/sysctl_net.in
index d922bbfa9..b990183b0 100644
--- a/src/xlat/sysctl_net.in
+++ b/src/xlat/sysctl_net.in
@@ -1,26 +1,48 @@
+#sorted
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-NET_LLC
-NET_NETFILTER
-NET_DCCP
-NET_IRDA
+/* NET_CORE was 0x01000000 in 1.3.82-pre2.0.11 */
+NET_CORE	1
+/* NET_ETHER was 0x02000000 in 1.3.82-pre2.0.11 */
+NET_ETHER	2
+/* NET_802 was 0x03000000 in 1.3.82-pre2.0.11 */
+NET_802		3
+/* NET_UNIX was 0x04000000 in 1.3.82-pre2.0.11 */
+NET_UNIX	4
+/* NET_IPV4 was 0x05000000 in 1.3.82-pre2.0.11 */
+NET_IPV4	5
+/* NET_IPX was 0x06000000 in 1.3.82-pre2.0.11 */
+NET_IPX		6
+/* NET_ATALK was 0x07000000 in 1.3.82-pre2.0.11 */
+NET_ATALK	7
+/* NET_NETROM was 0x08000000 in 1.3.82-pre2.0.11 */
+NET_NETROM	8
+/* NET_AX25 was 0x09000000 in 1.3.82-pre2.0.11 */
+NET_AX25	9
+/* pre2.0.11 */
+NET_BRIDGE	10
+/* 2.1.9, was 12 before 2.1.117pre1 */
+NET_ROSE	11
+/* 2.1.8, was 11 before 2.1.117pre1 */
+NET_IPV6	12
+/* 2.1.9 */
+NET_X25		13
+/* 2.1.26 */
+NET_TR		14
+/* 2.1.43pre1 */
+NET_DECNET	15
+/* 2.3.4pre2 */
+NET_ECONET	16
+/* 2.3.14, removed in 2.5.30, ba04edba */
+/* NET_KHTTPD	17 */
+/* 2.5.33, 08707d54 */
+NET_SCTP	17
+/* 2.6.14, 590232a7 */
+NET_LLC		18
+/* 2.6.15, 9fb9cbb1 */
+NET_NETFILTER	19
+/* 2.6.17, e55d912f */
+NET_DCCP	20
+/* Added in pre-2.1.132-2, moved to sysctl.h in 2.6.24, f429cd37 */
+NET_IRDA	412
diff --git a/src/xlat/sysctl_net_core.in b/src/xlat/sysctl_net_core.in
index 07719cf81..dcc7bac08 100644
--- a/src/xlat/sysctl_net_core.in
+++ b/src/xlat/sysctl_net_core.in
@@ -1,27 +1,41 @@
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-NET_CORE_WMEM_MAX
-NET_CORE_RMEM_MAX
-NET_CORE_WMEM_DEFAULT
-NET_CORE_RMEM_DEFAULT
-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
-#conditional
-NET_CORE_DESTROY_DELAY
-NET_CORE_BUDGET
-NET_CORE_AEVENT_ETIME
-NET_CORE_AEVENT_RSEQTH
-NET_CORE_WARNINGS
+/* 2.1.37pre3 */
+NET_CORE_WMEM_MAX		1
+NET_CORE_RMEM_MAX		2
+NET_CORE_WMEM_DEFAULT		3
+NET_CORE_RMEM_DEFAULT		4
+/* 2.1.43pre1, removed in 2.1.124 */
+NET_CORE_DESTROY_DELAY		5
+/* 2.1.79, was 5 during 2.1.124-2.1.128pre1 */
+NET_CORE_MAX_BACKLOG		6
+/* 2.1.79, was 6 during 2.1.124-2.1.128pre1 */
+NET_CORE_FASTROUTE		7
+/* 2.1.89, was 7 during 2.1.124-2.1.128pre1 */
+NET_CORE_MSG_COST		8
+/* 2.1.89, was 8 during 2.1.124-2.1.128pre1 */
+NET_CORE_MSG_BURST		9
+/* 2.1.90-pre, was 9 during 2.1.124-2.1.128pre1 */
+NET_CORE_OPTMEM_MAX		10
+/* 2.3.43pre7 */
+NET_CORE_HOT_LIST_LENGTH	11
+/* 2.4.0-test9pre6 */
+NET_CORE_DIVERT_VERSION		12
+/* 2.4.0-test10pre2 */
+NET_CORE_NO_CONG_THRESH		13
+NET_CORE_NO_CONG		14
+NET_CORE_LO_CONG		15
+NET_CORE_MOD_CONG		16
+/* 2.5.7-pre2, abb85ec3 */
+NET_CORE_DEV_WEIGHT		17
+/* 2.6.0-test10, 217e86f8 */
+NET_CORE_SOMAXCONN		18
+/* 2.6.13-rc1, 51b0bded */
+NET_CORE_BUDGET			19
+/* 2.6.17-rc1, f8cd5488 */
+NET_CORE_AEVENT_ETIME		20
+NET_CORE_AEVENT_RSEQTH		21
+/* 2.6.22-rc1, a2a316fd */
+NET_CORE_WARNINGS		22
diff --git a/src/xlat/sysctl_net_ipv4.in b/src/xlat/sysctl_net_ipv4.in
index fef4fe7b1..daf40e7b8 100644
--- a/src/xlat/sysctl_net_ipv4.in
+++ b/src/xlat/sysctl_net_ipv4.in
@@ -1,98 +1,239 @@
-#sorted
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-NET_IPV4_IGMP_MAX_MSF
-NET_TCP_NO_METRICS_SAVE
-NET_TCP_DEFAULT_WIN_SCALE
-NET_TCP_MODERATE_RCVBUF
-NET_TCP_TSO_WIN_DIVISOR
-NET_TCP_BIC_BETA
-NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR
-NET_TCP_CONG_CONTROL
-NET_TCP_ABC
-NET_IPV4_IPFRAG_MAX_DIST
-NET_TCP_MTU_PROBING
-NET_TCP_BASE_MSS
-NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS
-NET_TCP_DMA_COPYBREAK
-NET_TCP_SLOW_START_AFTER_IDLE
-NET_CIPSOV4_CACHE_ENABLE
-NET_CIPSOV4_CACHE_BUCKET_SIZE
-NET_CIPSOV4_RBM_OPTFMT
-NET_CIPSOV4_RBM_STRICTVALID
-NET_TCP_AVAIL_CONG_CONTROL
-NET_TCP_ALLOWED_CONG_CONTROL
-NET_TCP_MAX_SSTHRESH
-NET_TCP_FRTO_RESPONSE
+/* pre2.0.11, removed in 2.1.79 */
+/* NET_IPV4_ARP_RES_TIME           1 */
+/* NET_IPV4_ARP_DEAD_RES_TIME      2 */
+/* NET_IPV4_ARP_MAX_TRIES          3 */
+/* 2.1.43pre1, removed in 2.1.79 */
+/* NET_IPV4_ARP_MAX_PINGS          4 */
+/* pre2.0.11, was 4 before 2.1.43pre1, removed in 2.1.79 */
+/* NET_IPV4_ARP_TIMEOUT            5 */
+/* pre2.0.11, was 5 before 2.1.43pre1, removed in 2.1.79 */
+/* NET_IPV4_ARP_CHECK_INTERVAL     6 */
+/* pre2.0.11, was 6 before 2.1.43pre1, removed in 2.1.79 */
+/* NET_IPV4_ARP_CONFIRM_INTERVAL   7 */
+/* pre2.0.11, was 7 before 2.1.43pre1, removed in 2.1.79 */
+/* NET_IPV4_ARP_CONFIRM_TIMEOUT    8 */
+
+/* 2.1.15 as NET_IPV4_FORWARDING, was 9 before 2.1.36, was 14 before 2.1.43pre1, was 15 before 2.1.79, was 7 before 2.1.89, renamed to NET_IPV4_FORWARD in 2.1.89 */
+NET_IPV4_FORWARD			8
+/* 2.1.73, was 43 before 2.1.79, was 35 before 2.1.89 */
+NET_IPV4_DYNADDR			9
+
+/* 2.1.89 */
+NET_IPV4_CONF				16
+/* 2.1.79, was 49 before 2.1.89 */
+NET_IPV4_NEIGH				17
+/* 2.1.89 */
+NET_IPV4_ROUTE				18
+NET_IPV4_FIB_HASH			19
+NET_IPV4_NETFILTER			20
+
+/* 2.1.36, was 8 before 2.1.43pre1, was 9 before 2.1.79, was 1 before 2.1.89, removed in 2.1.127pre3 */
+/* NET_IPV4_TCP_HOE_RETRANSMITS		32 */
+/* 2.1.36, was 10 before 2.1.43pre1, was 11 before 2.1.79, was 3 before 2.1.89, removed in 2.1.90pre3 */
+/* NET_IPV4_TCP_TSACK			34 */
+/* 2.1.36, was 11 before 2.1.43pre1, was 12 before 2.1.79, was 4 before 2.1.89, was 35 before 2.1.90pre3 */
+NET_IPV4_TCP_TIMESTAMPS			33
+/* 2.1.36, was 12 before 2.1.43pre1, was 13 before 2.1.79, was 5 before 2.1.89, was 36 before 2.1.90pre3 */
+NET_IPV4_TCP_WINDOW_SCALING		34
+/* 2.1.36, was 9 before 2.1.43pre1, was 10 before 2.1.79, was 2 before 2.1.89, removed in 2.1.90pre3 with value of 33, returned back in 2.1.91pre1 */
+NET_IPV4_TCP_SACK			35
+/* 2.1.96pre1 */
+NET_IPV4_TCP_RETRANS_COLLAPSE		36
+/* 2.1.8, was 8 before 2.1.36, was 13 before 2.1.43pre1, was 14 before 2.1.79, was 6 before 2.1.89, was 37 before 2.1.90pre3, was 35 before 2.1.91pre1, removed in 2.1.92 */
+/* NET_IPV4_TCP_VEGAS_CONG_AVOID 36 */
+/* 2.1.15, was 10 before 2.1.36, was 15 before 2.1.43pre1, was 16 before 2.1.79, was 8 before 2.1.89, was 38 before 2.1.90pre3, was 36 before 2.1.91pre1, was 37 before 2.1.92, was 36 before 2.1.96pre1 */
+NET_IPV4_DEFAULT_TTL			37
+/* 2.1.15, was 11 before 2.1.36, was 16 before 2.1.43pre1, was 17 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_RFC1812_FILTER         9 */
+/* 2.1.15, was 12 before 2.1.36, was 17 before 2.1.43pre1, was 18 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_LOG_MARTIANS           10 */
+/* 2.1.15, was 13 before 2.1.36, was 18 before 2.1.43pre1, was 19 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_SOURCE_ROUTE           11 */
+/* 2.1.15, was 14 before 2.1.36, was 19 before 2.1.43pre1, removed in 2.1.68 */
+/* NET_IPV4_ADDRMASK_AGENT         20 */
+/* 2.1.15, was 15 before 2.1.36, was 20 before 2.1.43pre1, removed in 2.1.68 */
+/* NET_IPV4_BOOTP_AGENT            21 */
+/* 2.1.68, was 20 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_SEND_REDIRECTS         12 */
+/* 2.1.68, was 21 before 2.1.79, was 13 before 2.1.89, was 39 before 2.1.90pre3, was 37 before 2.1.91pre1, was 38 before 2.1.92, was 37 before 2.1.96pre1 */
+NET_IPV4_AUTOCONFIG			38
+/* 2.1.15, was 16 before 2.1.36, was 21 before 2.1.43pre1, was 22 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_BOOTP_RELAY            14 */
+/* 2.1.15, was 17 before 2.1.36, was 22 before 2.1.43pre1, removed in 2.1.68 */
+/* NET_IPV4_FIB_MODEL              23 */
+/* 2.1.68, was 23 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_PROXY_ARP              15 */
+/* 2.1.15, was 18 before 2.1.36, was 23 before 2.1.43pre1, was 24 before 2.1.79, was 16 before 2.1.89, was 40 before 2.1.90pre3, was 38 before 2.1.91pre1, was 39 before 2.1.92, was 38 before 2.1.96pre1 */
+NET_IPV4_NO_PMTU_DISC			39
+/* 2.1.15, was 19 before 2.1.36, was 24 before 2.1.43pre1, was 25 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_ACCEPT_REDIRECTS       17 */
+/* 2.1.15, was 20 before 2.1.36, was 25 before 2.1.43pre1, was 26 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_SECURE_REDIRECTS       18 */
+/* 2.1.15, was 21 before 2.1.36, was 26 before 2.1.43pre1, was 27 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_RFC1620_REDIRECTS      19 */
+/* 2.1.68, was 28 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_RTCACHE_FLUSH          20 */
+/* 2.1.38pre1 as NET_TCP_SYN_RETRIES, was 27 before 2.1.43pre1, renamed in 2.1.43pre1, was 28 before 2.1.68, was 29 before 2.1.79, was 21 before 2.1.89, was 41 before 2.1.90pre3, was 39 before 2.1.91pre1, was 40 before 2.1.92, was 39 before 2.1.96pre1 */
+NET_IPV4_TCP_SYN_RETRIES		40
+/* 2.1.40, removed in 2.1.43pre1 */
+/* NET_IPFRAG_HIGH_THRESH          28 */
+/* 2.1.40, removed in 2.1.43pre1 */
+/* NET_IPFRAG_LOW_THRESH           29 */
+/* 2.1.43pre1, was 29 before 2.1.68, was 30 before 2.1.79, was 22 before 2.1.89, was 42 before 2.1.90pre3, was 40 before 2.1.91pre1, was 41 before 2.1.92, was 40 before 2.1.96pre1 */
+NET_IPV4_IPFRAG_HIGH_THRESH		41
+/* 2.1.43pre1, was 30 before 2.1.68, was 31 before 2.1.79, was 23 before 2.1.89, was 43 before 2.1.90pre3, was 41 before 2.1.91pre1, was 42 before 2.1.92, was 41 before 2.1.96pre1 */
+NET_IPV4_IPFRAG_LOW_THRESH		42
+/* 2.1.43pre1, was 31 before 2.1.68, was 32 before 2.1.79, was 24 before 2.1.89, was 44 before 2.1.90pre3, was 42 before 2.1.91pre1, was 43 before 2.1.92, was 42 before 2.1.96pre1 */
+NET_IPV4_IPFRAG_TIME			43
+/* 2.1.43pre1, was 32 before 2.1.68, was 33 before 2.1.79, was 25 before 2.1.89, was 45 before 2.1.90pre3, was 43 before 2.1.91pre1, was 44 before 2.1.92, was 43 before 2.1.96pre1 */
+NET_IPV4_TCP_MAX_KA_PROBES		44
+/* 2.1.43pre1, was 33 before 2.1.68, was 34 before 2.1.79, was 26 before 2.1.89, was 46 before 2.1.90pre3, was 44 before 2.1.91pre1, was 45 before 2.1.92, was 44 before 2.1.96pre1 */
+NET_IPV4_TCP_KEEPALIVE_TIME		45
+/* 2.1.43pre1, was 34 before 2.1.68, was 35 before 2.1.79, was 27 before 2.1.89, was 47 before 2.1.90pre3, was 45 before 2.1.91pre1, was 46 before 2.1.92, was 45 before 2.1.96pre1 */
+NET_IPV4_TCP_KEEPALIVE_PROBES		46
+/* 2.1.43pre1, was 35 before 2.1.68, was 36 before 2.1.79, was 28 before 2.1.89, was 48 before 2.1.90pre3, was 46 before 2.1.91pre1, was 47 before 2.1.92, was 46 before 2.1.96pre1 */
+NET_IPV4_TCP_RETRIES1			47
+/* 2.1.43pre1, was 36 before 2.1.68, was 37 before 2.1.79, was 29 before 2.1.89, was 49 before 2.1.90pre3, was 47 before 2.1.91pre1, was 48 before 2.1.92, was 47 before 2.1.96pre1 */
+NET_IPV4_TCP_RETRIES2			48
+/* 2.1.43pre1, was 37 before 2.1.68, was 38 before 2.1.79, was 30 before 2.1.89, was 50 before 2.1.90pre3, was 48 before 2.1.91pre1, was 49 before 2.1.92, was 48 before 2.1.96pre1, removed in 2.1.99pre2 */
+/* NET_IPV4_TCP_MAX_DELAY_ACKS 49 */
+/* 2.1.43pre1, was 38 before 2.1.68, was 39 before 2.1.79, was 31 before 2.1.89, was 51 before 2.1.90pre3, was 49 before 2.1.91pre1, was 50 before 2.1.92, was 49 before 2.1.96pre1, was 50 before 2.1.99pre2 */
+NET_IPV4_TCP_FIN_TIMEOUT		49
+/* 2.1.43pre1, was 39 before 2.1.68, was 40 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_IGMP_MAX_HOST_REPORT_DELAY 32 */
+/* 2.1.43pre1, was 40 before 2.1.68, was 41 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_IGMP_TIMER_SCALE       33 */
+/* 2.1.43pre1, was 41 before 2.1.68, was 42 before 2.1.79, removed in 2.1.89 */
+/* NET_IPV4_IGMP_AGE_THRESHOLD     34 */
+/* 2.1.73, was 44 before 2.1.79, was 36 before 2.1.89, was 52 before 2.1.90pre3, was 50 before 2.1.91pre1, was 51 before 2.1.92, was 50 before 2.1.96pre1, was 51 before 2.1.99pre2 */
+NET_IPV4_IP_MASQ_DEBUG			50
+/* 2.1.43pre1, was 42 before 2.1.68, was 43 before 2.1.73, was 45 before 2.1.79, was 37 before 2.1.89, was 53 before 2.1.90pre3, was 51 before 2.1.91pre1, was 52 before 2.1.92, was 51 before 2.1.96pre1, was 52 before 2.1.99pre2 */
+NET_TCP_SYNCOOKIES			51
+/* 2.1.43pre1, removed in 2.1.53 */
+/* NET_TCP_ALWAYS_SYNCOOKIE        43 */
+/* 2.1.44pre3, was 44 before 2.1.53, was 43 before 2.1.68, was 44 before 2.1.73, was 46 before 2.1.79, was 38 before 2.1.89, was 54 before 2.1.90pre3, was 52 before 2.1.91pre1, was 53 before 2.1.92, was 52 before 2.1.96pre1, was 53 before 2.1.99pre2 */
+NET_TCP_STDURG				52
+/* 2.1.90, was 54 before 2.1.91pre1, was 54 before 2.1.92, was 53 before 2.1.96pre1, was 54 before 2.1.99pre2 */
+NET_TCP_RFC1337				53
+/* 2.1.53, was 45 before 2.1.68, was 45 before 2.1.73, was 47 before 2.1.79, was 39 before 2.1.89, was 55 before 2.1.90pre3, was 53 before 2.1.90, was 54 before 2.1.91pre1, was 55 before 2.1.92, was 54 before 2.1.96pre1, was 55 before 2.1.99pre2 */
+NET_TCP_SYN_TAILDROP			54
+/* 2.1.53, was 46 before 2.1.68, was 46 before 2.1.73, was 48 before 2.1.79, was 40 before 2.1.89, was 56 before 2.1.90pre3, was 54 before 2.1.90, was 55 before 2.1.91pre1, was 56 before 2.1.92, was 55 before 2.1.96pre1, was 56 before 2.1.99pre2 */
+NET_TCP_MAX_SYN_BACKLOG			55
+/* 2.1.68, was 47 before 2.1.73, was 49 before 2.1.79, was 41 before 2.1.89, was 57 before 2.1.90pre3, was 55 before 2.1.90, was 56 before 2.1.91pre1, was 57 before 2.1.92, was 56 before 2.1.96pre1, was 57 before 2.1.99pre2 */
+NET_IPV4_LOCAL_PORT_RANGE		56
+/* 2.1.68, was 48 before 2.1.73, was 50 before 2.1.79, was 42 before 2.1.89, was 58 before 2.1.90pre3, was 56 before 2.1.90, was 57 before 2.1.91pre1, was 58 before 2.1.92, was 57 before 2.1.96pre1, was 58 before 2.1.99pre2 */
+NET_IPV4_ICMP_ECHO_IGNORE_ALL		57
+/* 2.1.68, was 49 before 2.1.73, was 51 before 2.1.79, was 43 before 2.1.89, was 59 before 2.1.90pre3, was 57 before 2.1.90, was 58 before 2.1.91pre1, was 59 before 2.1.92, was 58 before 2.1.96pre1, was 59 before 2.1.99pre2 */
+NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS	58
+/* 2.1.68, was 50 before 2.1.73, was 52 before 2.1.79, was 44 before 2.1.89, was 60 before 2.1.90pre3, was 58 before 2.1.90, was 59 before 2.1.91pre1, was 60 before 2.1.92, was 59 before 2.1.96pre1, was 60 before 2.1.99pre2 */
+NET_IPV4_ICMP_SOURCEQUENCH_RATE		59
+/* 2.1.68, was 51 before 2.1.73, was 53 before 2.1.79, was 45 before 2.1.89, was 61 before 2.1.90pre3, was 59 before 2.1.90, was 60 before 2.1.91pre1, was 61 before 2.1.92, was 60 before 2.1.96pre1, was 61 before 2.1.99pre2 */
+NET_IPV4_ICMP_DESTUNREACH_RATE		60
+/* 2.1.68, was 52 before 2.1.73, was 54 before 2.1.79, was 46 before 2.1.89, was 62 before 2.1.90pre3, was 60 before 2.1.90, was 61 before 2.1.91pre1, was 62 before 2.1.92, was 61 before 2.1.96pre1, was 62 before 2.1.99pre2 */
+NET_IPV4_ICMP_TIMEEXCEED_RATE		61
+/* 2.1.68, was 53 before 2.1.73, was 55 before 2.1.79, was 47 before 2.1.89, was 63 before 2.1.90pre3, was 61 before 2.1.90, was 62 before 2.1.91pre1, was 63 before 2.1.92, was 62 before 2.1.96pre1, was 63 before 2.1.99pre2 */
+NET_IPV4_ICMP_PARAMPROB_RATE		62
+/* 2.1.68, was 54 before 2.1.73, was 56 before 2.1.79, was 48 before 2.1.89, was 64 before 2.1.90pre3, was 62 before 2.1.90, was 63 before 2.1.91pre1, was 64 before 2.1.92, was 63 before 2.1.96pre1, was 64 before 2.1.99pre2 */
+NET_IPV4_ICMP_ECHOREPLY_RATE		63
+/* 2.1.132pre3 */
+NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES	64
+/* 2.2.0pre5 */
+NET_IPV4_IGMP_MAX_MEMBERSHIPS		65
+/* 2.3.15pre3 */
+NET_TCP_TW_RECYCLE			66
+/* 2.3.18pre1 */
+NET_IPV4_ALWAYS_DEFRAG			67
+/* 2.3.18 */
+NET_IPV4_TCP_KEEPALIVE_INTVL		68
+/* 2.3.37 */
+NET_IPV4_INET_PEER_THRESHOLD		69
+NET_IPV4_INET_PEER_MINTTL		70
+NET_IPV4_INET_PEER_MAXTTL		71
+NET_IPV4_INET_PEER_GC_MINTIME		72
+NET_IPV4_INET_PEER_GC_MAXTIME		73
+/* 2.3.41pre2 */
+NET_TCP_ORPHAN_RETRIES			74
+NET_TCP_ABORT_ON_OVERFLOW		75
+NET_TCP_SYNACK_RETRIES			76
+NET_TCP_MAX_ORPHANS			77
+NET_TCP_MAX_TW_BUCKETS			78
+/* 2.4.0-test7pre1 */
+NET_TCP_FACK				79
+NET_TCP_REORDERING			80
+NET_TCP_ECN				81
+NET_TCP_DSACK				82
+NET_TCP_MEM				83
+NET_TCP_WMEM				84
+NET_TCP_RMEM				85
+NET_TCP_APP_WIN				86
+NET_TCP_ADV_WIN_SCALE			87
+/* 2.4.0-test10pre5 */
+NET_IPV4_NONLOCAL_BIND			88
+/* 2.4.9.2, 87f504e5 */
+NET_IPV4_ICMP_RATELIMIT			89
+NET_IPV4_ICMP_RATEMASK			90
+/* 2.5.8-pre2, b8439924 */
+NET_TCP_TW_REUSE			91
+/* 2.5.43, 074d9880 */
+NET_TCP_FRTO				92
+/* 2.5.60, 3ae4c190 */
+NET_TCP_LOW_LATENCY			93
+/* 2.6.0-test3, 8a15a6c8 */
+NET_IPV4_IPFRAG_SECRET_INTERVAL		94
+/* added in 2.6.3-rc1, 773be16a, removed in  2.6.13-rc1, 317a76f9 */
+NET_TCP_WESTWOOD			95
+/* 2.6.4-rc3, dc2a3808 */
+NET_IPV4_IGMP_MAX_MSF			96
+/* 2.6.6-rc3, 424be00c */
+NET_TCP_NO_METRICS_SAVE			97
+/* added in 2.6.6-rc3, 16a76bdb, removed in  2.6.13-rc1, 317a76f9 */
+NET_TCP_VEGAS				98
+NET_TCP_VEGAS_ALPHA			99
+NET_TCP_VEGAS_BETA			100
+NET_TCP_VEGAS_GAMMA			101
+/* added in 54d05783, 2.6.6, removed in  2.6.13-rc1, 317a76f9 */
+NET_TCP_BIC				102
+NET_TCP_BIC_FAST_CONVERGENCE		103
+NET_TCP_BIC_LOW_WINDOW			104
+/* 2.6.7-rc2, 4d9d9fa9 */
+NET_TCP_DEFAULT_WIN_SCALE		105
+/* 2.6.7-rc2, e8259a94 */
+NET_TCP_MODERATE_RCVBUF			106
+/* 2.6.9-rc4, 008f4d3c */
+NET_TCP_TSO_WIN_DIVISOR			107
+/* 2.6.11-rc5, 21e99435 */
+NET_TCP_BIC_BETA			108
+/* 2.6.12, 1c2fb7f9 */
+NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR	109
+/* 2.6.13-rc1, 317a76f9 */
+NET_TCP_CONG_CONTROL			110
+/* 2.6.15-rc1, 9772efb9 */
+NET_TCP_ABC				111
+/* 2.6.16-rc1, 89cee8b1 */
+NET_IPV4_IPFRAG_MAX_DIST		112
+/* 2.6.17-rc1, 5d424d5a */
+NET_TCP_MTU_PROBING			113
+NET_TCP_BASE_MSS			114
+/* 2.6.17-rc1, 15d99e02 */
+NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS	115
+/* 2.6.18-rc1, 95937825 */
+NET_TCP_DMA_COPYBREAK			116
+/* 2.6.18-rc1, 35089bb2 */
+NET_TCP_SLOW_START_AFTER_IDLE		117
+/* 2.6.19-rc1, 446fda4f */
+NET_CIPSOV4_CACHE_ENABLE		118
+NET_CIPSOV4_CACHE_BUCKET_SIZE		119
+NET_CIPSOV4_RBM_OPTFMT			120
+NET_CIPSOV4_RBM_STRICTVALID		121
+/* 2.6.20-rc2, 3ff825b2 */
+NET_TCP_AVAIL_CONG_CONTROL		122
+/* 2.6.20-rc2, ce7bc3bf */
+NET_TCP_ALLOWED_CONG_CONTROL		123
+/* 2.6.22-rc1, 886236c1 */
+NET_TCP_MAX_SSTHRESH			124
+/* 2.6.22-rc1, 3cfe3baa */
+NET_TCP_FRTO_RESPONSE			125
diff --git a/src/xlat/sysctl_net_ipv4_conf.in b/src/xlat/sysctl_net_ipv4_conf.in
index 9558be291..9255d9601 100644
--- a/src/xlat/sysctl_net_ipv4_conf.in
+++ b/src/xlat/sysctl_net_ipv4_conf.in
@@ -1,27 +1,43 @@
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-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
+/* 2.1.89 */
+NET_IPV4_CONF_FORWARDING		1
+NET_IPV4_CONF_MC_FORWARDING		2
+NET_IPV4_CONF_PROXY_ARP			3
+NET_IPV4_CONF_ACCEPT_REDIRECTS		4
+NET_IPV4_CONF_SECURE_REDIRECTS		5
+NET_IPV4_CONF_SEND_REDIRECTS		6
+NET_IPV4_CONF_SHARED_MEDIA		7
+NET_IPV4_CONF_RP_FILTER			8
+NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE	9
+NET_IPV4_CONF_BOOTP_RELAY		10
+NET_IPV4_CONF_LOG_MARTIANS		11
+/* 2.3.15pre3 */
+NET_IPV4_CONF_TAG			12
+/* 2.4.4.3 */
+NET_IPV4_CONF_ARPFILTER			13
+/* 2.5.8, 9a218f37 */
+NET_IPV4_CONF_MEDIUM_ID			14
+/* 2.5.47, 586cf468 */
+NET_IPV4_CONF_NOXFRM			15
+NET_IPV4_CONF_NOPOLICY			16
+/* 2.6.3-rc1, aef22e5b */
+NET_IPV4_CONF_FORCE_IGMP_VERSION	17
+/* 2.6.4-rc2, cd0e8af5 */
+NET_IPV4_CONF_ARP_ANNOUNCE		18
+/* 2.6.4-rc2, 4d99775f */
+NET_IPV4_CONF_ARP_IGNORE		19
+/* 2.6.12-rc6, 8f937c60 */
+NET_IPV4_CONF_PROMOTE_SECONDARIES	20
+/* 2.6.17-rc1, abd596a4 */
+NET_IPV4_CONF_ARP_ACCEPT		21
+/* 2.6.30-rc1, eefef1cf */
+NET_IPV4_CONF_ARP_NOTIFY		22
+/* 2.6.33-rc1, 8153a10c, removed in 2.6.34-rc1, 02291680 */
+NET_IPV4_CONF_ACCEPT_LOCAL		23
+/* 2.6.33-rc3, 28f6aeea, removed in 2.6.34-rc1, 02291680 */
+NET_IPV4_CONF_SRC_VMARK			24
+/* 2.6.34-rc1, 65324144, was 24 before d4a66e75, removed in 2.6.34-rc1, 02291680 */
+NET_IPV4_CONF_PROXY_ARP_PVLAN		25
diff --git a/src/xlat/sysctl_net_ipv4_route.in b/src/xlat/sysctl_net_ipv4_route.in
index d7b5bc65c..368c70165 100644
--- a/src/xlat/sysctl_net_ipv4_route.in
+++ b/src/xlat/sysctl_net_ipv4_route.in
@@ -1,24 +1,29 @@
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS
+/* 2.1.89 */
+NET_IPV4_ROUTE_FLUSH			1
+NET_IPV4_ROUTE_MIN_DELAY		2 /* obsolete since 2.6.25, 29e75252 */
+NET_IPV4_ROUTE_MAX_DELAY		3 /* obsolete since 2.6.25, 29e75252 */
+NET_IPV4_ROUTE_GC_THRESH		4
+NET_IPV4_ROUTE_MAX_SIZE			5
+NET_IPV4_ROUTE_GC_MIN_INTERVAL		6
+NET_IPV4_ROUTE_GC_TIMEOUT		7
+NET_IPV4_ROUTE_GC_INTERVAL		8 /* obsolete since 2.6.38, 349d2895 */
+NET_IPV4_ROUTE_REDIRECT_LOAD		9
+NET_IPV4_ROUTE_REDIRECT_NUMBER		10
+NET_IPV4_ROUTE_REDIRECT_SILENCE		11
+NET_IPV4_ROUTE_ERROR_COST		12
+NET_IPV4_ROUTE_ERROR_BURST		13
+/* 2.1.91pre1 */
+NET_IPV4_ROUTE_GC_ELASTICITY		14
+/* 2.2.4pre6 */
+NET_IPV4_ROUTE_MTU_EXPIRES		15
+/* 2.3.15pre3 */
+NET_IPV4_ROUTE_MIN_PMTU			16
+NET_IPV4_ROUTE_MIN_ADVMSS		17
+/* 2.5.69, 8b1309d9 */
+NET_IPV4_ROUTE_SECRET_INTERVAL		18
+/* 2.6.11, d81a2253 */
+NET_IPV4_ROUTE_GC_MIN_INTERVAL_MS	19
diff --git a/src/xlat/sysctl_net_ipv6.in b/src/xlat/sysctl_net_ipv6.in
index 3cd48c523..2902d0c09 100644
--- a/src/xlat/sysctl_net_ipv6.in
+++ b/src/xlat/sysctl_net_ipv6.in
@@ -1,15 +1,20 @@
+#sorted
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-NET_IPV6_MLD_MAX_MSF
+/* 2.1.89 */
+NET_IPV6_CONF				16
+NET_IPV6_NEIGH				17
+/* 2.5.45, 524354b4 */
+NET_IPV6_ROUTE				18
+/* 2.5.45, 29cdd1db */
+NET_IPV6_ICMP				19
+/* 2.5.45, 524354b4 */
+NET_IPV6_BINDV6ONLY			20
+/* 2.5.71, 44cca8a2 */
+NET_IPV6_IP6FRAG_HIGH_THRESH		21
+NET_IPV6_IP6FRAG_LOW_THRESH		22
+NET_IPV6_IP6FRAG_TIME			23
+NET_IPV6_IP6FRAG_SECRET_INTERVAL	24
+/* 2.6.4-rc3, b46f30e2 */
+NET_IPV6_MLD_MAX_MSF			25
diff --git a/src/xlat/sysctl_net_ipv6_route.in b/src/xlat/sysctl_net_ipv6_route.in
index ec3f958f9..9e61df4c6 100644
--- a/src/xlat/sysctl_net_ipv6_route.in
+++ b/src/xlat/sysctl_net_ipv6_route.in
@@ -1,15 +1,19 @@
+#value_indexed
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS
+/* 2.1.90-pre */
+NET_IPV6_ROUTE_FLUSH			1
+NET_IPV6_ROUTE_GC_THRESH		2
+NET_IPV6_ROUTE_MAX_SIZE			3
+NET_IPV6_ROUTE_GC_MIN_INTERVAL		4
+NET_IPV6_ROUTE_GC_TIMEOUT		5
+NET_IPV6_ROUTE_GC_INTERVAL		6
+/* 2.1.91pre1 */
+NET_IPV6_ROUTE_GC_ELASTICITY		7
+/* 2.2.4pre6 */
+NET_IPV6_ROUTE_MTU_EXPIRES		8
+/* 2.3.15pre3 */
+NET_IPV6_ROUTE_MIN_ADVMSS		9
+/* 2.6.12-rc1, bbeface4 */
+NET_IPV6_ROUTE_GC_MIN_INTERVAL_MS	10
diff --git a/src/xlat/sysctl_net_unix.in b/src/xlat/sysctl_net_unix.in
index 7440a9289..32079e763 100644
--- a/src/xlat/sysctl_net_unix.in
+++ b/src/xlat/sysctl_net_unix.in
@@ -1,4 +1,9 @@
-#unconditional
-NET_UNIX_DESTROY_DELAY
-NET_UNIX_DELETE_DELAY
-NET_UNIX_MAX_DGRAM_QLEN
+#value_indexed
+#enum
+#include <sys/types.h>
+#include <linux/sysctl.h>
+/* 2.1.43pre1 */
+NET_UNIX_DESTROY_DELAY	1
+NET_UNIX_DELETE_DELAY	2
+/* 2.2.4pre6 */
+NET_UNIX_MAX_DGRAM_QLEN	3
diff --git a/src/xlat/sysctl_root.in b/src/xlat/sysctl_root.in
index f8d18485a..947646202 100644
--- a/src/xlat/sysctl_root.in
+++ b/src/xlat/sysctl_root.in
@@ -1,20 +1,42 @@
+#sorted
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-CTL_KERN
-CTL_VM
-CTL_NET
-CTL_FS
-CTL_DEBUG
-CTL_DEV
-CTL_BUS
-CTL_ABI
-CTL_CPU
-#conditional
-CTL_PROC
-CTL_ARLAN
-CTL_S390DBF
-CTL_SUNRPC
-CTL_PM
-CTL_FRV
+/* 1.3.57 */
+CTL_KERN	1
+CTL_VM		2
+CTL_NET		3
+/* Removed in 2.6.18-rc1, eab03ac7 */
+/* Reappeared in 2.6.23-rc2, 0d0ed42e */
+CTL_PROC	4
+CTL_FS		5
+CTL_DEBUG	6
+CTL_DEV		7
+/* 2.2.7pre4 */
+CTL_BUS		8
+/* 2.4.9.8, 932f485f */
+CTL_ABI		9
+/* 2.4.14.3, d40d1af9 */
+CTL_CPU		10
+/* Added in 2.6.13-rc3, 0eeca283 */
+/* Removed in 2.6.13-rc4, 0399cb08, 2005-07-13 */
+CTL_INOTIFY	11
+/* Appeared in 2.5.63, 973d11a7 */
+/* Moved to sysctl.h. in 2.6.21-rc1, 59fc5313 */
+CTL_ARLAN	254
+/* Appeared in 2.6.4-rc1, 457ed08f */
+/* Moved to sysctl.h. in 2.6.21-rc1, feceb63ec */
+/* Removed in v2.6.24-rc4, 37e3a6ac, 2007-11-20 */
+CTL_APPLDATA	2120
+/* Appeared in 2.6.11-rc4, 464f3583 */
+/* Moved to sysctl.h. in 2.6.21-rc1, feceb63e */
+CTL_S390DBF	5677
+/* Appeared (probably) in 2.1.32 */
+/* Moved to sysctl.h in 2.6.21-rc1, 50d851f7 */
+CTL_SUNRPC	7249
+/* Appeared in 2.6.11-rc1, 1e1f2e5d */
+/* Moved to sysctl.h. in 2.6.21-rc1, 77f6dfb1 */
+CTL_FRV		9898
+/* Appeared in 2.6.11-rc1, d4c48371 */
+/* Moved to sysctl.h in 2.6.21-rc1, 462591b8 */
+CTL_PM		9899
diff --git a/src/xlat/sysctl_vm.in b/src/xlat/sysctl_vm.in
index 71c41727a..b1a116dbc 100644
--- a/src/xlat/sysctl_vm.in
+++ b/src/xlat/sysctl_vm.in
@@ -1,25 +1,100 @@
+#sorted
 #enum
 #include <sys/types.h>
 #include <linux/sysctl.h>
-#unconditional
-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
-#conditional
-VM_MAX_MAP_COUNT
-VM_LAPTOP_MODE
-VM_BLOCK_DUMP
-VM_HUGETLB_GROUP
-VM_VFS_CACHE_PRESSURE
-VM_LEGACY_VA_LAYOUT
-VM_SWAP_TOKEN_TIMEOUT
+/* 1.3.57 */
+/* Was VM_SWAPCTL before 2.5.23, e3e529bf -  struct: Set vm swapping control */
+VM_UNUSED1		1	/* was: struct: Set vm swapping control */
+/* 1.3.57 */
+/* VM_KSWAPD 2 - removed in 2.1.43pre1 */
+/* Was 3 before 2.1.43pre1 */
+/* int: Background pageout interval */
+/* Was VM_SWAPOUT before 2.5.23, e3e529bf - int: Linear or sqrt() swapout for hogs */
+VM_UNUSED2		2	/* was; int: Linear or sqrt() swapout for hogs */
+/* 1.3.60 */
+/* Was 4 before 2.1.43pre1 */
+/* Was VM_FREEPG before 2.5.23, e3e529bf - struct: Set free page thresholds */
+VM_UNUSED3		3	/* was: struct: Set free page thresholds */
+/* 1.3.69 */
+/* Was 4 before 2.1.36, was 5 before 2.1.43pre1 */
+/* Was VM_BDFLUSH before 2.5.12, 090da372 */
+/* Was VM_BDFLUSH_UNUSED before 2.5.30, a074f680 */
+VM_UNUSED4		4	/* Spare */
+/* 2.1.27, Was 7 before 2.1.36, was 6 before 2.1.43pre1 */
+VM_OVERCOMMIT_MEMORY	5	/* Turn off the virtual memory safety limit */
+/* Was 7 before 2.1.43pre1 */
+/* Was VM_BUFFERMEM before 2.5.23, e3e529bf - struct: Set buffer memory thresholds */
+/* Was VM_UNUSED4 before 2.5.30, a074f680 */
+VM_UNUSED5		6	/* was: struct: Set buffer memory thresholds */
+/* 2.1.91 */
+/* Was VM_PAGECACHE before 2.5.23, e3e529bf - struct: Set cache memory thresholds */
+/* Was VM_UNUSED5 before 2.5.30, a074f680 */
+VM_UNUSED7		7	/* was: struct: Set cache memory thresholds */
+/* 2.1.100pre2 */
+/* Was VM_PAGERDAEMON before 2.5.30, a074f680 */
+VM_UNUSED8		8	/* was: struct: Control kswapd behaviour */
+/* 2.1.106 */
+/* Was VM_PGT_CACHE before 2.5.23, e3e529bf - struct: Set page table cache parameters */
+/* Was VM_UNUSED6 before 2.5.30, a074f680 */
+VM_UNUSED9		9	/* was: struct: Set page table cache parameters */
+/* 2.1.132pre3 */
+/* Before 2.2.0pre2 - int: set number of pages to swap together */
+VM_PAGE_CLUSTER		10	/* int: set number of pages to swap together */
+/* 2.5.23, e3e529bf */
+VM_DIRTY_BACKGROUND	11	/* dirty_background_ratio */
+/* 2.5.23, e3e529bf, was VM_DIRTY_ASYNC before 2.5.43, bf175bc4 */
+VM_DIRTY_RATIO		12	/* dirty_ratio */
+/* VM_DIRTY_SYNC 13 - dirty_sync_ratio, added in 2.5.23, e3e529bf, removed in 2.5.37, da1eca60 */
+/* 2.5.23, e3e529bf, was 14 before 2.5.37, da1eca60 */
+VM_DIRTY_WB_CS		13	/* dirty_writeback_centisecs */
+/* 2.5.23, e3e529bf, was 15 before 2.5.37, da1eca60 */
+VM_DIRTY_EXPIRE_CS	14	/* dirty_expire_centisecs */
+/* 2.5.25, f0e10c64, was 16 before 2.5.37, da1eca60 */
+VM_NR_PDFLUSH_THREADS	15	/* nr_pdflush_threads */
+/* 2.5.30, 502bff06, was 17 before 2.5.37, da1eca60 */
+VM_OVERCOMMIT_RATIO	16	/* percent of RAM to allow overcommit in */
+/* 2.5.36, ef5cc2fd, was 18 before 2.5.37, da1eca60 */
+VM_PAGEBUF		17	/* struct: Control pagebuf parameters */
+/* 2.5.37, a7d2851c */
+VM_HUGETLB_PAGES	18	/* int: Number of available Huge Pages */
+/* 2.5.43, 8f7a1404 */
+VM_SWAPPINESS		19	/* Tendency to steal mapped memory */
+/* 2.5.52, c1859213 */
+/* Was VM_LOWER_ZONE_PROTECTION before 2.6.11-rc3, 96fa06f4 */
+VM_LOWMEM_RESERVE_RATIO	20	/* reservation ratio for lower memory zones */
+/* 2.5.71, cefe53f8 */
+VM_MIN_FREE_KBYTES	21	/* Minimum free kilobytes to maintain */
+/* 2.6.5, 56d93842 */
+VM_MAX_MAP_COUNT	22	/* int: Maximum number of mmaps/address-space */
+/* 2.6.6-rc1, 93d33a48 */
+VM_LAPTOP_MODE		23	/* vm laptop mode */
+VM_BLOCK_DUMP		24	/* block dump mode */
+/* 2.6.7, cd053a94 */
+VM_HUGETLB_GROUP	25	/* permitted hugetlb group */
+/* 2.6.9-rc1, a4411519 */
+VM_VFS_CACHE_PRESSURE	26	/* dcache/icache reclaim pressure */
+/* 2.6.9-rc2, 64e3b6b6 */
+VM_LEGACY_VA_LAYOUT	27	/* legacy/compatibility virtual address space layout */
+/* 2.6.10-rc3, 1caf076b */
+VM_SWAP_TOKEN_TIMEOUT	28	/* default time for token time out */
+/* 2.6.16-rc1, 9d0243bc */
+VM_DROP_PAGECACHE	29	/* int: nuke lots of pagecache */
+/* 2.6.16-rc1, 8ad4b1fb */
+VM_PERCPU_PAGELIST_FRACTION	30	/* int: fraction of pages in each percpu_pagelist */
+/* 2.6.16-rc2, 1743660b */
+VM_ZONE_RECLAIM_MODE	31	/* reclaim local zone memory before going off node */
+/* 2.6.16-rc2, 2a11ff06 */
+/* Was VM_ZONE_RECLAIM_INTERVAL before 2.6.18-rc1, 9614634f */
+VM_MIN_UNMAPPED		32	/* Set min percent of unmapped pages */
+/* 2.6.18-rc1, fadd8fbd */
+VM_PANIC_ON_OOM		33	/* panic at out-of-memory */
+/* 2.6.18-rc1, e6e5494c */
+VM_VDSO_ENABLED		34	/* map VDSO into new processes? */
+/* 2.6.19-rc1, 0ff38490 */
+VM_MIN_SLAB		35	/* Percent pages ignored by zone reclaim */
+
+/* Added in 2.6.21-rc1, feceb63ec, removed in 2.6.24-rc4, 43ebbf11 */
+/* s390 vm cmm sysctls */
+VM_CMM_PAGES		1111
+VM_CMM_TIMED_PAGES	1112
+VM_CMM_TIMEOUT		1113