@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls.c,v 1.30 2009/03/18 10:22:44 cegger Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.31 2009/03/18 17:30:25 pooka Exp $ */
 
 /*
  * System call vector and marshalling for rump.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.30 2009/03/18 10:22:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.31 2009/03/18 17:30:25 pooka Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -26,7 +26,7 @@
 
 int rump_enosys(void);
 int
-rump_enosys(void)
+rump_enosys()
 {
 
 	return ENOSYS;
@@ -38,14 +38,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_read_args arg;
+	struct sys_read_args callarg;
 
-	SPARG(&arg, fd) = fd;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, nbyte) = nbyte;
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, nbyte) = nbyte;
 
 	error = rump_sysproxy(SYS_read, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -60,14 +60,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_write_args arg;
+	struct sys_write_args callarg;
 
-	SPARG(&arg, fd) = fd;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, nbyte) = nbyte;
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, nbyte) = nbyte;
 
 	error = rump_sysproxy(SYS_write, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -82,14 +82,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_open_args arg;
+	struct sys_open_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, flags) = flags;
-	SPARG(&arg, mode) = mode;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, flags) = flags;
+	SPARG(&callarg, mode) = mode;
 
 	error = rump_sysproxy(SYS_open, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -104,12 +104,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_close_args arg;
+	struct sys_close_args callarg;
 
-	SPARG(&arg, fd) = fd;
+	SPARG(&callarg, fd) = fd;
 
 	error = rump_sysproxy(SYS_close, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -124,13 +124,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_link_args arg;
+	struct sys_link_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, link) = link;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, link) = link;
 
 	error = rump_sysproxy(SYS_link, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -145,12 +145,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_unlink_args arg;
+	struct sys_unlink_args callarg;
 
-	SPARG(&arg, path) = path;
+	SPARG(&callarg, path) = path;
 
 	error = rump_sysproxy(SYS_unlink, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -165,12 +165,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_chdir_args arg;
+	struct sys_chdir_args callarg;
 
-	SPARG(&arg, path) = path;
+	SPARG(&callarg, path) = path;
 
 	error = rump_sysproxy(SYS_chdir, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -185,12 +185,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_fchdir_args arg;
+	struct sys_fchdir_args callarg;
 
-	SPARG(&arg, fd) = fd;
+	SPARG(&callarg, fd) = fd;
 
 	error = rump_sysproxy(SYS_fchdir, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -205,13 +205,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_chmod_args arg;
+	struct sys_chmod_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, mode) = mode;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, mode) = mode;
 
 	error = rump_sysproxy(SYS_chmod, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -226,14 +226,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_chown_args arg;
+	struct sys_chown_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, uid) = uid;
-	SPARG(&arg, gid) = gid;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, uid) = uid;
+	SPARG(&callarg, gid) = gid;
 
 	error = rump_sysproxy(SYS_chown, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -248,13 +248,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_unmount_args arg;
+	struct sys_unmount_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_unmount, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -269,14 +269,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_recvmsg_args arg;
+	struct sys_recvmsg_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, msg) = msg;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, msg) = msg;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_recvmsg, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -291,14 +291,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_sendmsg_args arg;
+	struct sys_sendmsg_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, msg) = msg;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, msg) = msg;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_sendmsg, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -313,17 +313,17 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_recvfrom_args arg;
+	struct sys_recvfrom_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, len) = len;
-	SPARG(&arg, flags) = flags;
-	SPARG(&arg, from) = from;
-	SPARG(&arg, fromlenaddr) = fromlenaddr;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, len) = len;
+	SPARG(&callarg, flags) = flags;
+	SPARG(&callarg, from) = from;
+	SPARG(&callarg, fromlenaddr) = fromlenaddr;
 
 	error = rump_sysproxy(SYS_recvfrom, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -338,14 +338,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_accept_args arg;
+	struct sys_accept_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, name) = name;
-	SPARG(&arg, anamelen) = anamelen;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, anamelen) = anamelen;
 
 	error = rump_sysproxy(SYS_accept, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -360,14 +360,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_getpeername_args arg;
+	struct sys_getpeername_args callarg;
 
-	SPARG(&arg, fdes) = fdes;
-	SPARG(&arg, asa) = asa;
-	SPARG(&arg, alen) = alen;
+	SPARG(&callarg, fdes) = fdes;
+	SPARG(&callarg, asa) = asa;
+	SPARG(&callarg, alen) = alen;
 
 	error = rump_sysproxy(SYS_getpeername, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -382,14 +382,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_getsockname_args arg;
+	struct sys_getsockname_args callarg;
 
-	SPARG(&arg, fdes) = fdes;
-	SPARG(&arg, asa) = asa;
-	SPARG(&arg, alen) = alen;
+	SPARG(&callarg, fdes) = fdes;
+	SPARG(&callarg, asa) = asa;
+	SPARG(&callarg, alen) = alen;
 
 	error = rump_sysproxy(SYS_getsockname, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -404,13 +404,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_chflags_args arg;
+	struct sys_chflags_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_chflags, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -440,14 +440,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_ioctl_args arg;
+	struct sys_ioctl_args callarg;
 
-	SPARG(&arg, fd) = fd;
-	SPARG(&arg, com) = com;
-	SPARG(&arg, data) = data;
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, com) = com;
+	SPARG(&callarg, data) = data;
 
 	error = rump_sysproxy(SYS_ioctl, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -462,13 +462,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_symlink_args arg;
+	struct sys_symlink_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, link) = link;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, link) = link;
 
 	error = rump_sysproxy(SYS_symlink, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -483,14 +483,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_readlink_args arg;
+	struct sys_readlink_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, count) = count;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, count) = count;
 
 	error = rump_sysproxy(SYS_readlink, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -505,12 +505,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_fsync_args arg;
+	struct sys_fsync_args callarg;
 
-	SPARG(&arg, fd) = fd;
+	SPARG(&callarg, fd) = fd;
 
 	error = rump_sysproxy(SYS_fsync, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -525,14 +525,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_connect_args arg;
+	struct sys_connect_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, name) = name;
-	SPARG(&arg, namelen) = namelen;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, namelen) = namelen;
 
 	error = rump_sysproxy(SYS_connect, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -547,14 +547,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_bind_args arg;
+	struct sys_bind_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, name) = name;
-	SPARG(&arg, namelen) = namelen;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, namelen) = namelen;
 
 	error = rump_sysproxy(SYS_bind, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -569,16 +569,16 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_setsockopt_args arg;
+	struct sys_setsockopt_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, level) = level;
-	SPARG(&arg, name) = name;
-	SPARG(&arg, val) = val;
-	SPARG(&arg, valsize) = valsize;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, level) = level;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, val) = val;
+	SPARG(&callarg, valsize) = valsize;
 
 	error = rump_sysproxy(SYS_setsockopt, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -593,13 +593,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_listen_args arg;
+	struct sys_listen_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, backlog) = backlog;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, backlog) = backlog;
 
 	error = rump_sysproxy(SYS_listen, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -614,16 +614,16 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_getsockopt_args arg;
+	struct sys_getsockopt_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, level) = level;
-	SPARG(&arg, name) = name;
-	SPARG(&arg, val) = val;
-	SPARG(&arg, avalsize) = avalsize;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, level) = level;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, val) = val;
+	SPARG(&callarg, avalsize) = avalsize;
 
 	error = rump_sysproxy(SYS_getsockopt, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -638,13 +638,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_rename_args arg;
+	struct sys_rename_args callarg;
 
-	SPARG(&arg, from) = from;
-	SPARG(&arg, to) = to;
+	SPARG(&callarg, from) = from;
+	SPARG(&callarg, to) = to;
 
 	error = rump_sysproxy(SYS_rename, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -659,13 +659,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_mkfifo_args arg;
+	struct sys_mkfifo_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, mode) = mode;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, mode) = mode;
 
 	error = rump_sysproxy(SYS_mkfifo, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -680,17 +680,17 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_sendto_args arg;
+	struct sys_sendto_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, len) = len;
-	SPARG(&arg, flags) = flags;
-	SPARG(&arg, to) = to;
-	SPARG(&arg, tolen) = tolen;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, len) = len;
+	SPARG(&callarg, flags) = flags;
+	SPARG(&callarg, to) = to;
+	SPARG(&callarg, tolen) = tolen;
 
 	error = rump_sysproxy(SYS_sendto, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -705,13 +705,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_shutdown_args arg;
+	struct sys_shutdown_args callarg;
 
-	SPARG(&arg, s) = s;
-	SPARG(&arg, how) = how;
+	SPARG(&callarg, s) = s;
+	SPARG(&callarg, how) = how;
 
 	error = rump_sysproxy(SYS_shutdown, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -726,15 +726,15 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_socketpair_args arg;
+	struct sys_socketpair_args callarg;
 
-	SPARG(&arg, domain) = domain;
-	SPARG(&arg, type) = type;
-	SPARG(&arg, protocol) = protocol;
-	SPARG(&arg, rsv) = rsv;
+	SPARG(&callarg, domain) = domain;
+	SPARG(&callarg, type) = type;
+	SPARG(&callarg, protocol) = protocol;
+	SPARG(&callarg, rsv) = rsv;
 
 	error = rump_sysproxy(SYS_socketpair, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -749,13 +749,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_mkdir_args arg;
+	struct sys_mkdir_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, mode) = mode;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, mode) = mode;
 
 	error = rump_sysproxy(SYS_mkdir, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -770,12 +770,12 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_rmdir_args arg;
+	struct sys_rmdir_args callarg;
 
-	SPARG(&arg, path) = path;
+	SPARG(&callarg, path) = path;
 
 	error = rump_sysproxy(SYS_rmdir, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -790,13 +790,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_nfssvc_args arg;
+	struct sys_nfssvc_args callarg;
 
-	SPARG(&arg, flag) = flag;
-	SPARG(&arg, argp) = argp;
+	SPARG(&callarg, flag) = flag;
+	SPARG(&callarg, argp) = argp;
 
 	error = rump_sysproxy(SYS_nfssvc, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -811,16 +811,16 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_pread_args arg;
+	struct sys_pread_args callarg;
 
-	SPARG(&arg, fd) = fd;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, nbyte) = nbyte;
-	SPARG(&arg, pad) = pad;
-	SPARG(&arg, offset) = offset;
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, nbyte) = nbyte;
+	SPARG(&callarg, pad) = pad;
+	SPARG(&callarg, offset) = offset;
 
 	error = rump_sysproxy(SYS_pread, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -835,16 +835,16 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_pwrite_args arg;
+	struct sys_pwrite_args callarg;
 
-	SPARG(&arg, fd) = fd;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, nbyte) = nbyte;
-	SPARG(&arg, pad) = pad;
-	SPARG(&arg, offset) = offset;
+	SPARG(&callarg, fd) = fd;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, nbyte) = nbyte;
+	SPARG(&callarg, pad) = pad;
+	SPARG(&callarg, offset) = offset;
 
 	error = rump_sysproxy(SYS_pwrite, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -859,14 +859,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_truncate_args arg;
+	struct sys_truncate_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, pad) = pad;
-	SPARG(&arg, length) = length;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, pad) = pad;
+	SPARG(&callarg, length) = length;
 
 	error = rump_sysproxy(SYS_truncate, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -881,17 +881,17 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___sysctl_args arg;
+	struct sys___sysctl_args callarg;
 
-	SPARG(&arg, name) = name;
-	SPARG(&arg, namelen) = namelen;
-	SPARG(&arg, old) = old;
-	SPARG(&arg, oldlenp) = oldlenp;
-	SPARG(&arg, new) = new;
-	SPARG(&arg, newlen) = newlen;
+	SPARG(&callarg, name) = name;
+	SPARG(&callarg, namelen) = namelen;
+	SPARG(&callarg, old) = old;
+	SPARG(&callarg, oldlenp) = oldlenp;
+	SPARG(&callarg, new) = new;
+	SPARG(&callarg, newlen) = newlen;
 
 	error = rump_sysproxy(SYS___sysctl, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -906,13 +906,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_lchmod_args arg;
+	struct sys_lchmod_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, mode) = mode;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, mode) = mode;
 
 	error = rump_sysproxy(SYS_lchmod, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -927,14 +927,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_lchown_args arg;
+	struct sys_lchown_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, uid) = uid;
-	SPARG(&arg, gid) = gid;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, uid) = uid;
+	SPARG(&callarg, gid) = gid;
 
 	error = rump_sysproxy(SYS_lchown, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -949,13 +949,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_lchflags_args arg;
+	struct sys_lchflags_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_lchflags, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -970,14 +970,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys_statvfs1_args arg;
+	struct sys_statvfs1_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, buf) = buf;
-	SPARG(&arg, flags) = flags;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, buf) = buf;
+	SPARG(&callarg, flags) = flags;
 
 	error = rump_sysproxy(SYS_statvfs1, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -992,14 +992,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___socket30_args arg;
+	struct sys___socket30_args callarg;
 
-	SPARG(&arg, domain) = domain;
-	SPARG(&arg, type) = type;
-	SPARG(&arg, protocol) = protocol;
+	SPARG(&callarg, domain) = domain;
+	SPARG(&callarg, type) = type;
+	SPARG(&callarg, protocol) = protocol;
 
 	error = rump_sysproxy(SYS___socket30, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1014,14 +1014,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___getfh30_args arg;
+	struct sys___getfh30_args callarg;
 
-	SPARG(&arg, fname) = fname;
-	SPARG(&arg, fhp) = fhp;
-	SPARG(&arg, fh_size) = fh_size;
+	SPARG(&callarg, fname) = fname;
+	SPARG(&callarg, fhp) = fhp;
+	SPARG(&callarg, fh_size) = fh_size;
 
 	error = rump_sysproxy(SYS___getfh30, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1036,13 +1036,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___utimes50_args arg;
+	struct sys___utimes50_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, tptr) = tptr;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, tptr) = tptr;
 
 	error = rump_sysproxy(SYS___utimes50, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1057,13 +1057,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___lutimes50_args arg;
+	struct sys___lutimes50_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, tptr) = tptr;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, tptr) = tptr;
 
 	error = rump_sysproxy(SYS___lutimes50, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1078,13 +1078,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___stat50_args arg;
+	struct sys___stat50_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, ub) = ub;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, ub) = ub;
 
 	error = rump_sysproxy(SYS___stat50, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1099,13 +1099,13 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___lstat50_args arg;
+	struct sys___lstat50_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, ub) = ub;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, ub) = ub;
 
 	error = rump_sysproxy(SYS___lstat50, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);
@@ -1120,14 +1120,14 @@
 {
 	register_t retval = 0;
 	int error = 0;
-	struct sys___mknod50_args arg;
+	struct sys___mknod50_args callarg;
 
-	SPARG(&arg, path) = path;
-	SPARG(&arg, mode) = mode;
-	SPARG(&arg, dev) = dev;
+	SPARG(&callarg, path) = path;
+	SPARG(&callarg, mode) = mode;
+	SPARG(&callarg, dev) = dev;
 
 	error = rump_sysproxy(SYS___mknod50, rump_sysproxy_arg,
-	    (uint8_t *)&arg, sizeof(arg), &retval);
+	    (uint8_t *)&callarg, sizeof(callarg), &retval);
 	if (error) {
 		retval = -1;
 		rumpuser_seterrno(error);