Use XLAT macro

Automatically convert all xlat structures to XLAT form
using the following sed regexp:
s/^[[:space:]]*{[[:space:]]*\([^",}[:space:]]\+\)[[:space:]]*,[[:space:]]*"\1",\?[[:space:]]*}[[:space:]]*/\tXLAT(\1)/

1 files changed, 235 insertions, 235 deletions

diff --git a/system.c b/system.c
index 26d0d7f..08cf359 100644
--- a/system.c
+++ b/system.c
@@ -81,33 +81,33 @@
 #include <linux/sysctl.h>
 
 static const struct xlat mount_flags[] = {
-	{ MS_MGC_VAL,	"MS_MGC_VAL"	},
-	{ MS_RDONLY,	"MS_RDONLY"	},
-	{ MS_NOSUID,	"MS_NOSUID"	},
-	{ MS_NODEV,	"MS_NODEV"	},
-	{ MS_NOEXEC,	"MS_NOEXEC"	},
-	{ MS_SYNCHRONOUS,"MS_SYNCHRONOUS"},
-	{ MS_REMOUNT,	"MS_REMOUNT"	},
-	{ MS_RELATIME,	"MS_RELATIME"	},
-	{ MS_KERNMOUNT,	"MS_KERNMOUNT"	},
-	{ MS_I_VERSION,	"MS_I_VERSION"	},
-	{ MS_STRICTATIME,"MS_STRICTATIME"},
-	{ MS_NOSEC,	"MS_NOSEC"	},
-	{ MS_BORN,	"MS_BORN"	},
-	{ MS_MANDLOCK,	"MS_MANDLOCK"	},
-	{ MS_NOATIME,	"MS_NOATIME"	},
-	{ MS_NODIRATIME,"MS_NODIRATIME"	},
-	{ MS_BIND,	"MS_BIND"	},
-	{ MS_MOVE,	"MS_MOVE"	},
-	{ MS_REC,	"MS_REC"	},
-	{ MS_SILENT,	"MS_SILENT"	},
-	{ MS_POSIXACL,	"MS_POSIXACL"	},
-	{ MS_UNBINDABLE,"MS_UNBINDABLE"	},
-	{ MS_PRIVATE,	"MS_PRIVATE"	},
-	{ MS_SLAVE,	"MS_SLAVE"	},
-	{ MS_SHARED,	"MS_SHARED"	},
-	{ MS_ACTIVE,	"MS_ACTIVE"	},
-	{ MS_NOUSER,	"MS_NOUSER"	},
+	XLAT(MS_MGC_VAL),
+	XLAT(MS_RDONLY),
+	XLAT(MS_NOSUID),
+	XLAT(MS_NODEV),
+	XLAT(MS_NOEXEC),
+	XLAT(MS_SYNCHRONOUS),
+	XLAT(MS_REMOUNT),
+	XLAT(MS_RELATIME),
+	XLAT(MS_KERNMOUNT),
+	XLAT(MS_I_VERSION),
+	XLAT(MS_STRICTATIME),
+	XLAT(MS_NOSEC),
+	XLAT(MS_BORN),
+	XLAT(MS_MANDLOCK),
+	XLAT(MS_NOATIME),
+	XLAT(MS_NODIRATIME),
+	XLAT(MS_BIND),
+	XLAT(MS_MOVE),
+	XLAT(MS_REC),
+	XLAT(MS_SILENT),
+	XLAT(MS_POSIXACL),
+	XLAT(MS_UNBINDABLE),
+	XLAT(MS_PRIVATE),
+	XLAT(MS_SLAVE),
+	XLAT(MS_SHARED),
+	XLAT(MS_ACTIVE),
+	XLAT(MS_NOUSER),
 	{ 0,		NULL		},
 };
 
@@ -155,9 +155,9 @@ sys_mount(struct tcb *tcp)
 #define MNT_EXPIRE	0x00000004	/* Mark for expiry */
 
 static const struct xlat umount_flags[] = {
-	{ MNT_FORCE,	"MNT_FORCE"	},
-	{ MNT_DETACH,	"MNT_DETACH"	},
-	{ MNT_EXPIRE,	"MNT_EXPIRE"	},
+	XLAT(MNT_FORCE),
+	XLAT(MNT_DETACH),
+	XLAT(MNT_EXPIRE),
 	{ 0,		NULL		},
 };
 
@@ -222,17 +222,17 @@ enum {
 };
 
 static const struct xlat syslog_action_type[] = {
-	{ SYSLOG_ACTION_CLOSE,		"SYSLOG_ACTION_CLOSE"		},
-	{ SYSLOG_ACTION_OPEN,		"SYSLOG_ACTION_OPEN"		},
-	{ SYSLOG_ACTION_READ,		"SYSLOG_ACTION_READ"		},
-	{ SYSLOG_ACTION_READ_ALL,	"SYSLOG_ACTION_READ_ALL"	},
-	{ SYSLOG_ACTION_READ_CLEAR,	"SYSLOG_ACTION_READ_CLEAR"	},
-	{ SYSLOG_ACTION_CLEAR,		"SYSLOG_ACTION_CLEAR"		},
-	{ SYSLOG_ACTION_CONSOLE_OFF,	"SYSLOG_ACTION_CONSOLE_OFF"	},
-	{ SYSLOG_ACTION_CONSOLE_ON,	"SYSLOG_ACTION_CONSOLE_ON"	},
-	{ SYSLOG_ACTION_CONSOLE_LEVEL,	"SYSLOG_ACTION_CONSOLE_LEVEL"	},
-	{ SYSLOG_ACTION_SIZE_UNREAD,	"SYSLOG_ACTION_SIZE_UNREAD"	},
-	{ SYSLOG_ACTION_SIZE_BUFFER,	"SYSLOG_ACTION_SIZE_BUFFER"	},
+	XLAT(SYSLOG_ACTION_CLOSE),
+	XLAT(SYSLOG_ACTION_OPEN),
+	XLAT(SYSLOG_ACTION_READ),
+	XLAT(SYSLOG_ACTION_READ_ALL),
+	XLAT(SYSLOG_ACTION_READ_CLEAR),
+	XLAT(SYSLOG_ACTION_CLEAR),
+	XLAT(SYSLOG_ACTION_CONSOLE_OFF),
+	XLAT(SYSLOG_ACTION_CONSOLE_ON),
+	XLAT(SYSLOG_ACTION_CONSOLE_LEVEL),
+	XLAT(SYSLOG_ACTION_SIZE_UNREAD),
+	XLAT(SYSLOG_ACTION_SIZE_BUFFER),
 	{ 0,				NULL				}
 };
 
@@ -275,24 +275,24 @@ sys_syslog(struct tcb *tcp)
 
 #include <linux/reboot.h>
 static const struct xlat bootflags1[] = {
-	{ LINUX_REBOOT_MAGIC1,	"LINUX_REBOOT_MAGIC1"	},
+	XLAT(LINUX_REBOOT_MAGIC1),
 	{ 0,			NULL			},
 };
 
 static const struct xlat bootflags2[] = {
-	{ LINUX_REBOOT_MAGIC2,	"LINUX_REBOOT_MAGIC2"	},
-	{ LINUX_REBOOT_MAGIC2A,	"LINUX_REBOOT_MAGIC2A"	},
-	{ LINUX_REBOOT_MAGIC2B,	"LINUX_REBOOT_MAGIC2B"	},
+	XLAT(LINUX_REBOOT_MAGIC2),
+	XLAT(LINUX_REBOOT_MAGIC2A),
+	XLAT(LINUX_REBOOT_MAGIC2B),
 	{ 0,			NULL			},
 };
 
 static const struct xlat bootflags3[] = {
-	{ LINUX_REBOOT_CMD_CAD_OFF,	"LINUX_REBOOT_CMD_CAD_OFF"	},
-	{ LINUX_REBOOT_CMD_RESTART,	"LINUX_REBOOT_CMD_RESTART"	},
-	{ LINUX_REBOOT_CMD_HALT,	"LINUX_REBOOT_CMD_HALT"		},
-	{ LINUX_REBOOT_CMD_CAD_ON,	"LINUX_REBOOT_CMD_CAD_ON"	},
-	{ LINUX_REBOOT_CMD_POWER_OFF,	"LINUX_REBOOT_CMD_POWER_OFF"	},
-	{ LINUX_REBOOT_CMD_RESTART2,	"LINUX_REBOOT_CMD_RESTART2"	},
+	XLAT(LINUX_REBOOT_CMD_CAD_OFF),
+	XLAT(LINUX_REBOOT_CMD_RESTART),
+	XLAT(LINUX_REBOOT_CMD_HALT),
+	XLAT(LINUX_REBOOT_CMD_CAD_ON),
+	XLAT(LINUX_REBOOT_CMD_POWER_OFF),
+	XLAT(LINUX_REBOOT_CMD_RESTART2),
 	{ 0,				NULL				},
 };
 
@@ -316,26 +316,26 @@ sys_reboot(struct tcb *tcp)
 #ifdef M68K
 static const struct xlat cacheflush_scope[] = {
 #ifdef FLUSH_SCOPE_LINE
-	{ FLUSH_SCOPE_LINE,	"FLUSH_SCOPE_LINE" },
+	XLAT(FLUSH_SCOPE_LINE),
 #endif
 #ifdef FLUSH_SCOPE_PAGE
-	{ FLUSH_SCOPE_PAGE,	"FLUSH_SCOPE_PAGE" },
+	XLAT(FLUSH_SCOPE_PAGE),
 #endif
 #ifdef FLUSH_SCOPE_ALL
-	{ FLUSH_SCOPE_ALL,	"FLUSH_SCOPE_ALL" },
+	XLAT(FLUSH_SCOPE_ALL),
 #endif
 	{ 0,			NULL },
 };
 
 static const struct xlat cacheflush_flags[] = {
 #ifdef FLUSH_CACHE_BOTH
-	{ FLUSH_CACHE_BOTH,	"FLUSH_CACHE_BOTH" },
+	XLAT(FLUSH_CACHE_BOTH),
 #endif
 #ifdef FLUSH_CACHE_DATA
-	{ FLUSH_CACHE_DATA,	"FLUSH_CACHE_DATA" },
+	XLAT(FLUSH_CACHE_DATA),
 #endif
 #ifdef FLUSH_CACHE_INSN
-	{ FLUSH_CACHE_INSN,	"FLUSH_CACHE_INSN" },
+	XLAT(FLUSH_CACHE_INSN),
 #endif
 	{ 0,			NULL },
 };
@@ -363,11 +363,11 @@ sys_cacheflush(struct tcb *tcp)
 #include <bfin_sram.h>
 
 static const struct xlat sram_alloc_flags[] = {
-	{ L1_INST_SRAM,		"L1_INST_SRAM" },
-	{ L1_DATA_A_SRAM,	"L1_DATA_A_SRAM" },
-	{ L1_DATA_B_SRAM,	"L1_DATA_B_SRAM" },
-	{ L1_DATA_SRAM,		"L1_DATA_SRAM" },
-	{ L2_SRAM,		"L2_SRAM" },
+	XLAT(L1_INST_SRAM),
+	XLAT(L1_DATA_A_SRAM),
+	XLAT(L1_DATA_B_SRAM),
+	XLAT(L1_DATA_SRAM),
+	XLAT(L2_SRAM),
 	{ 0,			NULL },
 };
 
@@ -386,9 +386,9 @@ sys_sram_alloc(struct tcb *tcp)
 #include <asm/cachectl.h>
 
 static const struct xlat cacheflush_flags[] = {
-	{ ICACHE,	"ICACHE" },
-	{ DCACHE,	"DCACHE" },
-	{ BCACHE,	"BCACHE" },
+	XLAT(ICACHE),
+	XLAT(DCACHE),
+	XLAT(BCACHE),
 	{ 0,		NULL },
 };
 
@@ -411,16 +411,16 @@ sys_cacheflush(struct tcb *tcp)
 #ifdef SH
 static const struct xlat cacheflush_flags[] = {
 #ifdef CACHEFLUSH_D_INVAL
-	{ CACHEFLUSH_D_INVAL,	"CACHEFLUSH_D_INVAL" },
+	XLAT(CACHEFLUSH_D_INVAL),
 #endif
 #ifdef CACHEFLUSH_D_WB
-	{ CACHEFLUSH_D_WB,	"CACHEFLUSH_D_WB" },
+	XLAT(CACHEFLUSH_D_WB),
 #endif
 #ifdef CACHEFLUSH_D_PURGE
-	{ CACHEFLUSH_D_PURGE,	"CACHEFLUSH_D_PURGE" },
+	XLAT(CACHEFLUSH_D_PURGE),
 #endif
 #ifdef CACHEFLUSH_I
-	{ CACHEFLUSH_I,		"CACHEFLUSH_I" },
+	XLAT(CACHEFLUSH_I),
 #endif
 	{ 0,			NULL },
 };
@@ -499,9 +499,9 @@ static const struct xlat capabilities[] = {
 #endif
 
 static const struct xlat cap_version[] = {
-	{ _LINUX_CAPABILITY_VERSION_1,	"_LINUX_CAPABILITY_VERSION_1"	},
-	{ _LINUX_CAPABILITY_VERSION_2,	"_LINUX_CAPABILITY_VERSION_3"	},
-	{ _LINUX_CAPABILITY_VERSION_3,	"_LINUX_CAPABILITY_VERSION_3"	},
+	XLAT(_LINUX_CAPABILITY_VERSION_1),
+	XLAT(_LINUX_CAPABILITY_VERSION_2),
+	XLAT(_LINUX_CAPABILITY_VERSION_3),
 	{ 0,				NULL				}
 };
 
@@ -590,244 +590,244 @@ int sys_capset(struct tcb *tcp)
 # define CTL_PROC 4
 # define CTL_CPU 10		/* older headers lack */
 static const struct xlat sysctl_root[] = {
-	{ CTL_KERN, "CTL_KERN" },
-	{ CTL_VM, "CTL_VM" },
-	{ CTL_NET, "CTL_NET" },
-	{ CTL_PROC, "CTL_PROC" },
-	{ CTL_FS, "CTL_FS" },
-	{ CTL_DEBUG, "CTL_DEBUG" },
-	{ CTL_DEV, "CTL_DEV" },
-	{ CTL_BUS, "CTL_BUS" },
-	{ CTL_ABI, "CTL_ABI" },
-	{ CTL_CPU, "CTL_CPU" },
+	XLAT(CTL_KERN),
+	XLAT(CTL_VM),
+	XLAT(CTL_NET),
+	XLAT(CTL_PROC),
+	XLAT(CTL_FS),
+	XLAT(CTL_DEBUG),
+	XLAT(CTL_DEV),
+	XLAT(CTL_BUS),
+	XLAT(CTL_ABI),
+	XLAT(CTL_CPU),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_kern[] = {
-	{ KERN_OSTYPE, "KERN_OSTYPE" },
-	{ KERN_OSRELEASE, "KERN_OSRELEASE" },
-	{ KERN_OSREV, "KERN_OSREV" },
-	{ KERN_VERSION, "KERN_VERSION" },
-	{ KERN_SECUREMASK, "KERN_SECUREMASK" },
-	{ KERN_PROF, "KERN_PROF" },
-	{ KERN_NODENAME, "KERN_NODENAME" },
-	{ KERN_DOMAINNAME, "KERN_DOMAINNAME" },
+	XLAT(KERN_OSTYPE),
+	XLAT(KERN_OSRELEASE),
+	XLAT(KERN_OSREV),
+	XLAT(KERN_VERSION),
+	XLAT(KERN_SECUREMASK),
+	XLAT(KERN_PROF),
+	XLAT(KERN_NODENAME),
+	XLAT(KERN_DOMAINNAME),
 #ifdef KERN_SECURELVL
-	{ KERN_SECURELVL, "KERN_SECURELVL" },
+	XLAT(KERN_SECURELVL),
 #endif
-	{ KERN_PANIC, "KERN_PANIC" },
+	XLAT(KERN_PANIC),
 #ifdef KERN_REALROOTDEV
-	{ KERN_REALROOTDEV, "KERN_REALROOTDEV" },
+	XLAT(KERN_REALROOTDEV),
 #endif
 #ifdef KERN_JAVA_INTERPRETER
-	{ KERN_JAVA_INTERPRETER, "KERN_JAVA_INTERPRETER" },
+	XLAT(KERN_JAVA_INTERPRETER),
 #endif
 #ifdef KERN_JAVA_APPLETVIEWER
-	{ KERN_JAVA_APPLETVIEWER, "KERN_JAVA_APPLETVIEWER" },
+	XLAT(KERN_JAVA_APPLETVIEWER),
 #endif
-	{ KERN_SPARC_REBOOT, "KERN_SPARC_REBOOT" },
-	{ KERN_CTLALTDEL, "KERN_CTLALTDEL" },
-	{ KERN_PRINTK, "KERN_PRINTK" },
-	{ KERN_NAMETRANS, "KERN_NAMETRANS" },
-	{ KERN_PPC_HTABRECLAIM, "KERN_PPC_HTABRECLAIM" },
-	{ KERN_PPC_ZEROPAGED, "KERN_PPC_ZEROPAGED" },
-	{ KERN_PPC_POWERSAVE_NAP, "KERN_PPC_POWERSAVE_NAP" },
-	{ KERN_MODPROBE, "KERN_MODPROBE" },
-	{ KERN_SG_BIG_BUFF, "KERN_SG_BIG_BUFF" },
-	{ KERN_ACCT, "KERN_ACCT" },
-	{ KERN_PPC_L2CR, "KERN_PPC_L2CR" },
-	{ KERN_RTSIGNR, "KERN_RTSIGNR" },
-	{ KERN_RTSIGMAX, "KERN_RTSIGMAX" },
-	{ KERN_SHMMAX, "KERN_SHMMAX" },
-	{ KERN_MSGMAX, "KERN_MSGMAX" },
-	{ KERN_MSGMNB, "KERN_MSGMNB" },
-	{ KERN_MSGPOOL, "KERN_MSGPOOL" },
+	XLAT(KERN_SPARC_REBOOT),
+	XLAT(KERN_CTLALTDEL),
+	XLAT(KERN_PRINTK),
+	XLAT(KERN_NAMETRANS),
+	XLAT(KERN_PPC_HTABRECLAIM),
+	XLAT(KERN_PPC_ZEROPAGED),
+	XLAT(KERN_PPC_POWERSAVE_NAP),
+	XLAT(KERN_MODPROBE),
+	XLAT(KERN_SG_BIG_BUFF),
+	XLAT(KERN_ACCT),
+	XLAT(KERN_PPC_L2CR),
+	XLAT(KERN_RTSIGNR),
+	XLAT(KERN_RTSIGMAX),
+	XLAT(KERN_SHMMAX),
+	XLAT(KERN_MSGMAX),
+	XLAT(KERN_MSGMNB),
+	XLAT(KERN_MSGPOOL),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_vm[] = {
 #ifdef VM_SWAPCTL
-	{ VM_SWAPCTL, "VM_SWAPCTL" },
+	XLAT(VM_SWAPCTL),
 #endif
 #ifdef VM_UNUSED1
-	{ VM_UNUSED1, "VM_UNUSED1" },
+	XLAT(VM_UNUSED1),
 #endif
 #ifdef VM_SWAPOUT
-	{ VM_SWAPOUT, "VM_SWAPOUT" },
+	XLAT(VM_SWAPOUT),
 #endif
 #ifdef VM_UNUSED2
-	{ VM_UNUSED2, "VM_UNUSED2" },
+	XLAT(VM_UNUSED2),
 #endif
 #ifdef VM_FREEPG
-	{ VM_FREEPG, "VM_FREEPG" },
+	XLAT(VM_FREEPG),
 #endif
 #ifdef VM_UNUSED3
-	{ VM_UNUSED3, "VM_UNUSED3" },
+	XLAT(VM_UNUSED3),
 #endif
 #ifdef VM_BDFLUSH
-	{ VM_BDFLUSH, "VM_BDFLUSH" },
+	XLAT(VM_BDFLUSH),
 #endif
 #ifdef VM_UNUSED4
-	{ VM_UNUSED4, "VM_UNUSED4" },
+	XLAT(VM_UNUSED4),
 #endif
-	{ VM_OVERCOMMIT_MEMORY, "VM_OVERCOMMIT_MEMORY" },
+	XLAT(VM_OVERCOMMIT_MEMORY),
 #ifdef VM_BUFFERMEM
-	{ VM_BUFFERMEM, "VM_BUFFERMEM" },
+	XLAT(VM_BUFFERMEM),
 #endif
 #ifdef VM_UNUSED5
-	{ VM_UNUSED5, "VM_UNUSED5" },
+	XLAT(VM_UNUSED5),
 #endif
 #ifdef VM_PAGECACHE
-	{ VM_PAGECACHE, "VM_PAGECACHE" },
+	XLAT(VM_PAGECACHE),
 #endif
 #ifdef VM_UNUSED7
-	{ VM_UNUSED7, "VM_UNUSED7" },
+	XLAT(VM_UNUSED7),
 #endif
 #ifdef VM_PAGERDAEMON
-	{ VM_PAGERDAEMON, "VM_PAGERDAEMON" },
+	XLAT(VM_PAGERDAEMON),
 #endif
 #ifdef VM_UNUSED8
-	{ VM_UNUSED8, "VM_UNUSED8" },
+	XLAT(VM_UNUSED8),
 #endif
 #ifdef VM_PGT_CACHE
-	{ VM_PGT_CACHE, "VM_PGT_CACHE" },
+	XLAT(VM_PGT_CACHE),
 #endif
 #ifdef VM_UNUSED9
-	{ VM_UNUSED9, "VM_UNUSED9" },
+	XLAT(VM_UNUSED9),
 #endif
-	{ VM_PAGE_CLUSTER, "VM_PAGE_CLUSTER" },
+	XLAT(VM_PAGE_CLUSTER),
 	{ 0, NULL },
 };
 
 static const struct xlat sysctl_net[] = {
-	{ NET_CORE, "NET_CORE" },
-	{ NET_ETHER, "NET_ETHER" },
-	{ NET_802, "NET_802" },
-	{ NET_UNIX, "NET_UNIX" },
-	{ NET_IPV4, "NET_IPV4" },
-	{ NET_IPX, "NET_IPX" },
-	{ NET_ATALK, "NET_ATALK" },
-	{ NET_NETROM, "NET_NETROM" },
-	{ NET_AX25, "NET_AX25" },
-	{ NET_BRIDGE, "NET_BRIDGE" },
-	{ NET_ROSE, "NET_ROSE" },
-	{ NET_IPV6, "NET_IPV6" },
-	{ NET_X25, "NET_X25" },
-	{ NET_TR, "NET_TR" },
-	{ NET_DECNET, "NET_DECNET" },
+	XLAT(NET_CORE),
+	XLAT(NET_ETHER),
+	XLAT(NET_802),
+	XLAT(NET_UNIX),
+	XLAT(NET_IPV4),
+	XLAT(NET_IPX),
+	XLAT(NET_ATALK),
+	XLAT(NET_NETROM),
+	XLAT(NET_AX25),
+	XLAT(NET_BRIDGE),
+	XLAT(NET_ROSE),
+	XLAT(NET_IPV6),
+	XLAT(NET_X25),
+	XLAT(NET_TR),
+	XLAT(NET_DECNET),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_core[] = {
-	{ NET_CORE_WMEM_MAX, "NET_CORE_WMEM_MAX" },
-	{ NET_CORE_RMEM_MAX, "NET_CORE_RMEM_MAX" },
-	{ NET_CORE_WMEM_DEFAULT, "NET_CORE_WMEM_DEFAULT" },
-	{ NET_CORE_RMEM_DEFAULT, "NET_CORE_RMEM_DEFAULT" },
-	{ NET_CORE_MAX_BACKLOG, "NET_CORE_MAX_BACKLOG" },
-	{ NET_CORE_FASTROUTE, "NET_CORE_FASTROUTE" },
-	{ NET_CORE_MSG_COST, "NET_CORE_MSG_COST" },
-	{ NET_CORE_MSG_BURST, "NET_CORE_MSG_BURST" },
-	{ NET_CORE_OPTMEM_MAX, "NET_CORE_OPTMEM_MAX" },
+	XLAT(NET_CORE_WMEM_MAX),
+	XLAT(NET_CORE_RMEM_MAX),
+	XLAT(NET_CORE_WMEM_DEFAULT),
+	XLAT(NET_CORE_RMEM_DEFAULT),
+	XLAT(NET_CORE_MAX_BACKLOG),
+	XLAT(NET_CORE_FASTROUTE),
+	XLAT(NET_CORE_MSG_COST),
+	XLAT(NET_CORE_MSG_BURST),
+	XLAT(NET_CORE_OPTMEM_MAX),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_unix[] = {
-	{ NET_UNIX_DESTROY_DELAY, "NET_UNIX_DESTROY_DELAY" },
-	{ NET_UNIX_DELETE_DELAY, "NET_UNIX_DELETE_DELAY" },
+	XLAT(NET_UNIX_DESTROY_DELAY),
+	XLAT(NET_UNIX_DELETE_DELAY),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_ipv4[] = {
-	{ NET_IPV4_FORWARD, "NET_IPV4_FORWARD" },
-	{ NET_IPV4_DYNADDR, "NET_IPV4_DYNADDR" },
-	{ NET_IPV4_CONF, "NET_IPV4_CONF" },
-	{ NET_IPV4_NEIGH, "NET_IPV4_NEIGH" },
-	{ NET_IPV4_ROUTE, "NET_IPV4_ROUTE" },
-	{ NET_IPV4_FIB_HASH, "NET_IPV4_FIB_HASH" },
-	{ NET_IPV4_TCP_TIMESTAMPS, "NET_IPV4_TCP_TIMESTAMPS" },
-	{ NET_IPV4_TCP_WINDOW_SCALING, "NET_IPV4_TCP_WINDOW_SCALING" },
-	{ NET_IPV4_TCP_SACK, "NET_IPV4_TCP_SACK" },
-	{ NET_IPV4_TCP_RETRANS_COLLAPSE, "NET_IPV4_TCP_RETRANS_COLLAPSE" },
-	{ NET_IPV4_DEFAULT_TTL, "NET_IPV4_DEFAULT_TTL" },
-	{ NET_IPV4_AUTOCONFIG, "NET_IPV4_AUTOCONFIG" },
-	{ NET_IPV4_NO_PMTU_DISC, "NET_IPV4_NO_PMTU_DISC" },
-	{ NET_IPV4_TCP_SYN_RETRIES, "NET_IPV4_TCP_SYN_RETRIES" },
-	{ NET_IPV4_IPFRAG_HIGH_THRESH, "NET_IPV4_IPFRAG_HIGH_THRESH" },
-	{ NET_IPV4_IPFRAG_LOW_THRESH, "NET_IPV4_IPFRAG_LOW_THRESH" },
-	{ NET_IPV4_IPFRAG_TIME, "NET_IPV4_IPFRAG_TIME" },
-	{ NET_IPV4_TCP_MAX_KA_PROBES, "NET_IPV4_TCP_MAX_KA_PROBES" },
-	{ NET_IPV4_TCP_KEEPALIVE_TIME, "NET_IPV4_TCP_KEEPALIVE_TIME" },
-	{ NET_IPV4_TCP_KEEPALIVE_PROBES, "NET_IPV4_TCP_KEEPALIVE_PROBES" },
-	{ NET_IPV4_TCP_RETRIES1, "NET_IPV4_TCP_RETRIES1" },
-	{ NET_IPV4_TCP_RETRIES2, "NET_IPV4_TCP_RETRIES2" },
-	{ NET_IPV4_TCP_FIN_TIMEOUT, "NET_IPV4_TCP_FIN_TIMEOUT" },
-	{ NET_IPV4_IP_MASQ_DEBUG, "NET_IPV4_IP_MASQ_DEBUG" },
-	{ NET_TCP_SYNCOOKIES, "NET_TCP_SYNCOOKIES" },
-	{ NET_TCP_STDURG, "NET_TCP_STDURG" },
-	{ NET_TCP_RFC1337, "NET_TCP_RFC1337" },
-	{ NET_TCP_SYN_TAILDROP, "NET_TCP_SYN_TAILDROP" },
-	{ NET_TCP_MAX_SYN_BACKLOG, "NET_TCP_MAX_SYN_BACKLOG" },
-	{ NET_IPV4_LOCAL_PORT_RANGE, "NET_IPV4_LOCAL_PORT_RANGE" },
-	{ NET_IPV4_ICMP_ECHO_IGNORE_ALL, "NET_IPV4_ICMP_ECHO_IGNORE_ALL" },
-	{ NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS, "NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS" },
-	{ NET_IPV4_ICMP_SOURCEQUENCH_RATE, "NET_IPV4_ICMP_SOURCEQUENCH_RATE" },
-	{ NET_IPV4_ICMP_DESTUNREACH_RATE, "NET_IPV4_ICMP_DESTUNREACH_RATE" },
-	{ NET_IPV4_ICMP_TIMEEXCEED_RATE, "NET_IPV4_ICMP_TIMEEXCEED_RATE" },
-	{ NET_IPV4_ICMP_PARAMPROB_RATE, "NET_IPV4_ICMP_PARAMPROB_RATE" },
-	{ NET_IPV4_ICMP_ECHOREPLY_RATE, "NET_IPV4_ICMP_ECHOREPLY_RATE" },
-	{ NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES, "NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES" },
-	{ NET_IPV4_IGMP_MAX_MEMBERSHIPS, "NET_IPV4_IGMP_MAX_MEMBERSHIPS" },
+	XLAT(NET_IPV4_FORWARD),
+	XLAT(NET_IPV4_DYNADDR),
+	XLAT(NET_IPV4_CONF),
+	XLAT(NET_IPV4_NEIGH),
+	XLAT(NET_IPV4_ROUTE),
+	XLAT(NET_IPV4_FIB_HASH),
+	XLAT(NET_IPV4_TCP_TIMESTAMPS),
+	XLAT(NET_IPV4_TCP_WINDOW_SCALING),
+	XLAT(NET_IPV4_TCP_SACK),
+	XLAT(NET_IPV4_TCP_RETRANS_COLLAPSE),
+	XLAT(NET_IPV4_DEFAULT_TTL),
+	XLAT(NET_IPV4_AUTOCONFIG),
+	XLAT(NET_IPV4_NO_PMTU_DISC),
+	XLAT(NET_IPV4_TCP_SYN_RETRIES),
+	XLAT(NET_IPV4_IPFRAG_HIGH_THRESH),
+	XLAT(NET_IPV4_IPFRAG_LOW_THRESH),
+	XLAT(NET_IPV4_IPFRAG_TIME),
+	XLAT(NET_IPV4_TCP_MAX_KA_PROBES),
+	XLAT(NET_IPV4_TCP_KEEPALIVE_TIME),
+	XLAT(NET_IPV4_TCP_KEEPALIVE_PROBES),
+	XLAT(NET_IPV4_TCP_RETRIES1),
+	XLAT(NET_IPV4_TCP_RETRIES2),
+	XLAT(NET_IPV4_TCP_FIN_TIMEOUT),
+	XLAT(NET_IPV4_IP_MASQ_DEBUG),
+	XLAT(NET_TCP_SYNCOOKIES),
+	XLAT(NET_TCP_STDURG),
+	XLAT(NET_TCP_RFC1337),
+	XLAT(NET_TCP_SYN_TAILDROP),
+	XLAT(NET_TCP_MAX_SYN_BACKLOG),
+	XLAT(NET_IPV4_LOCAL_PORT_RANGE),
+	XLAT(NET_IPV4_ICMP_ECHO_IGNORE_ALL),
+	XLAT(NET_IPV4_ICMP_ECHO_IGNORE_BROADCASTS),
+	XLAT(NET_IPV4_ICMP_SOURCEQUENCH_RATE),
+	XLAT(NET_IPV4_ICMP_DESTUNREACH_RATE),
+	XLAT(NET_IPV4_ICMP_TIMEEXCEED_RATE),
+	XLAT(NET_IPV4_ICMP_PARAMPROB_RATE),
+	XLAT(NET_IPV4_ICMP_ECHOREPLY_RATE),
+	XLAT(NET_IPV4_ICMP_IGNORE_BOGUS_ERROR_RESPONSES),
+	XLAT(NET_IPV4_IGMP_MAX_MEMBERSHIPS),
 	{  0, NULL }
 };
 
 static const struct xlat sysctl_net_ipv4_route[] = {
-	{ NET_IPV4_ROUTE_FLUSH, "NET_IPV4_ROUTE_FLUSH" },
-	{ NET_IPV4_ROUTE_MIN_DELAY, "NET_IPV4_ROUTE_MIN_DELAY" },
-	{ NET_IPV4_ROUTE_MAX_DELAY, "NET_IPV4_ROUTE_MAX_DELAY" },
-	{ NET_IPV4_ROUTE_GC_THRESH, "NET_IPV4_ROUTE_GC_THRESH" },
-	{ NET_IPV4_ROUTE_MAX_SIZE, "NET_IPV4_ROUTE_MAX_SIZE" },
-	{ NET_IPV4_ROUTE_GC_MIN_INTERVAL, "NET_IPV4_ROUTE_GC_MIN_INTERVAL" },
-	{ NET_IPV4_ROUTE_GC_TIMEOUT, "NET_IPV4_ROUTE_GC_TIMEOUT" },
-	{ NET_IPV4_ROUTE_GC_INTERVAL, "NET_IPV4_ROUTE_GC_INTERVAL" },
-	{ NET_IPV4_ROUTE_REDIRECT_LOAD, "NET_IPV4_ROUTE_REDIRECT_LOAD" },
-	{ NET_IPV4_ROUTE_REDIRECT_NUMBER, "NET_IPV4_ROUTE_REDIRECT_NUMBER" },
-	{ NET_IPV4_ROUTE_REDIRECT_SILENCE, "NET_IPV4_ROUTE_REDIRECT_SILENCE" },
-	{ NET_IPV4_ROUTE_ERROR_COST, "NET_IPV4_ROUTE_ERROR_COST" },
-	{ NET_IPV4_ROUTE_ERROR_BURST, "NET_IPV4_ROUTE_ERROR_BURST" },
-	{ NET_IPV4_ROUTE_GC_ELASTICITY, "NET_IPV4_ROUTE_GC_ELASTICITY" },
+	XLAT(NET_IPV4_ROUTE_FLUSH),
+	XLAT(NET_IPV4_ROUTE_MIN_DELAY),
+	XLAT(NET_IPV4_ROUTE_MAX_DELAY),
+	XLAT(NET_IPV4_ROUTE_GC_THRESH),
+	XLAT(NET_IPV4_ROUTE_MAX_SIZE),
+	XLAT(NET_IPV4_ROUTE_GC_MIN_INTERVAL),
+	XLAT(NET_IPV4_ROUTE_GC_TIMEOUT),
+	XLAT(NET_IPV4_ROUTE_GC_INTERVAL),
+	XLAT(NET_IPV4_ROUTE_REDIRECT_LOAD),
+	XLAT(NET_IPV4_ROUTE_REDIRECT_NUMBER),
+	XLAT(NET_IPV4_ROUTE_REDIRECT_SILENCE),
+	XLAT(NET_IPV4_ROUTE_ERROR_COST),
+	XLAT(NET_IPV4_ROUTE_ERROR_BURST),
+	XLAT(NET_IPV4_ROUTE_GC_ELASTICITY),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_ipv4_conf[] = {
-	{ NET_IPV4_CONF_FORWARDING, "NET_IPV4_CONF_FORWARDING" },
-	{ NET_IPV4_CONF_MC_FORWARDING, "NET_IPV4_CONF_MC_FORWARDING" },
-	{ NET_IPV4_CONF_PROXY_ARP, "NET_IPV4_CONF_PROXY_ARP" },
-	{ NET_IPV4_CONF_ACCEPT_REDIRECTS, "NET_IPV4_CONF_ACCEPT_REDIRECTS" },
-	{ NET_IPV4_CONF_SECURE_REDIRECTS, "NET_IPV4_CONF_SECURE_REDIRECTS" },
-	{ NET_IPV4_CONF_SEND_REDIRECTS, "NET_IPV4_CONF_SEND_REDIRECTS" },
-	{ NET_IPV4_CONF_SHARED_MEDIA, "NET_IPV4_CONF_SHARED_MEDIA" },
-	{ NET_IPV4_CONF_RP_FILTER, "NET_IPV4_CONF_RP_FILTER" },
-	{ NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE, "NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE" },
-	{ NET_IPV4_CONF_BOOTP_RELAY, "NET_IPV4_CONF_BOOTP_RELAY" },
-	{ NET_IPV4_CONF_LOG_MARTIANS, "NET_IPV4_CONF_LOG_MARTIANS" },
+	XLAT(NET_IPV4_CONF_FORWARDING),
+	XLAT(NET_IPV4_CONF_MC_FORWARDING),
+	XLAT(NET_IPV4_CONF_PROXY_ARP),
+	XLAT(NET_IPV4_CONF_ACCEPT_REDIRECTS),
+	XLAT(NET_IPV4_CONF_SECURE_REDIRECTS),
+	XLAT(NET_IPV4_CONF_SEND_REDIRECTS),
+	XLAT(NET_IPV4_CONF_SHARED_MEDIA),
+	XLAT(NET_IPV4_CONF_RP_FILTER),
+	XLAT(NET_IPV4_CONF_ACCEPT_SOURCE_ROUTE),
+	XLAT(NET_IPV4_CONF_BOOTP_RELAY),
+	XLAT(NET_IPV4_CONF_LOG_MARTIANS),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_ipv6[] = {
-	{ NET_IPV6_CONF, "NET_IPV6_CONF" },
-	{ NET_IPV6_NEIGH, "NET_IPV6_NEIGH" },
-	{ NET_IPV6_ROUTE, "NET_IPV6_ROUTE" },
+	XLAT(NET_IPV6_CONF),
+	XLAT(NET_IPV6_NEIGH),
+	XLAT(NET_IPV6_ROUTE),
 	{ 0, NULL }
 };
 
 static const struct xlat sysctl_net_ipv6_route[] = {
-	{ NET_IPV6_ROUTE_FLUSH, "NET_IPV6_ROUTE_FLUSH" },
-	{ NET_IPV6_ROUTE_GC_THRESH, "NET_IPV6_ROUTE_GC_THRESH" },
-	{ NET_IPV6_ROUTE_MAX_SIZE, "NET_IPV6_ROUTE_MAX_SIZE" },
-	{ NET_IPV6_ROUTE_GC_MIN_INTERVAL, "NET_IPV6_ROUTE_GC_MIN_INTERVAL" },
-	{ NET_IPV6_ROUTE_GC_TIMEOUT, "NET_IPV6_ROUTE_GC_TIMEOUT" },
-	{ NET_IPV6_ROUTE_GC_INTERVAL, "NET_IPV6_ROUTE_GC_INTERVAL" },
-	{ NET_IPV6_ROUTE_GC_ELASTICITY, "NET_IPV6_ROUTE_GC_ELASTICITY" },
+	XLAT(NET_IPV6_ROUTE_FLUSH),
+	XLAT(NET_IPV6_ROUTE_GC_THRESH),
+	XLAT(NET_IPV6_ROUTE_MAX_SIZE),
+	XLAT(NET_IPV6_ROUTE_GC_MIN_INTERVAL),
+	XLAT(NET_IPV6_ROUTE_GC_TIMEOUT),
+	XLAT(NET_IPV6_ROUTE_GC_INTERVAL),
+	XLAT(NET_IPV6_ROUTE_GC_ELASTICITY),
 	{ 0, NULL }
 };
 
@@ -993,11 +993,11 @@ sys_sysctl(struct tcb *tcp)
 #endif
 
 static const struct xlat sysmips_operations[] = {
-	{ SETNAME,		"SETNAME"	},
-	{ FLUSH_CACHE,		"FLUSH_CACHE"	},
-	{ MIPS_FIXADE,		"MIPS_FIXADE"	},
-	{ MIPS_RDNVRAM,		"MIPS_RDNVRAM"	},
-	{ MIPS_ATOMIC_SET,	"MIPS_ATOMIC_SET"	},
+	XLAT(SETNAME),
+	XLAT(FLUSH_CACHE),
+	XLAT(MIPS_FIXADE),
+	XLAT(MIPS_RDNVRAM),
+	XLAT(MIPS_ATOMIC_SET),
 	{ 0, NULL }
 };