diff --git a/sys/compat/linux/arch/amd64/linux_syscall.h b/sys/compat/linux/arch/amd64/linux_syscall.h
index 2cd2124772ff..80e320892f2d 100644
--- a/sys/compat/linux/arch/amd64/linux_syscall.h
+++ b/sys/compat/linux/arch/amd64/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.58 2015/09/24 14:42:45 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.59 2015/10/27 07:16:00 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.56 2015/10/27 07:15:38 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -333,10 +333,10 @@
 /* syscall: "getgid" ret: "gid_t" args: */
 #define	LINUX_SYS_getgid	104
 
-/* syscall: "setuid" ret: "void" args: "uid_t" */
+/* syscall: "setuid" ret: "int" args: "uid_t" */
 #define	LINUX_SYS_setuid	105
 
-/* syscall: "setgid" ret: "void" args: "gid_t" */
+/* syscall: "setgid" ret: "int" args: "gid_t" */
 #define	LINUX_SYS_setgid	106
 
 /* syscall: "geteuid" ret: "uid_t" args: */
diff --git a/sys/compat/linux/arch/amd64/linux_syscallargs.h b/sys/compat/linux/arch/amd64/linux_syscallargs.h
index 4864d98729ec..ad0d9f2acc6e 100644
--- a/sys/compat/linux/arch/amd64/linux_syscallargs.h
+++ b/sys/compat/linux/arch/amd64/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.58 2015/09/24 14:42:45 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.59 2015/10/27 07:16:00 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.56 2015/10/27 07:15:38 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
diff --git a/sys/compat/linux/arch/amd64/linux_syscalls.c b/sys/compat/linux/arch/amd64/linux_syscalls.c
index 672eea33945b..7f1a09838090 100644
--- a/sys/compat/linux/arch/amd64/linux_syscalls.c
+++ b/sys/compat/linux/arch/amd64/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.58 2015/09/24 14:42:45 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.59 2015/10/27 07:16:00 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.56 2015/10/27 07:15:38 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.58 2015/09/24 14:42:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.59 2015/10/27 07:16:00 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
diff --git a/sys/compat/linux/arch/amd64/linux_sysent.c b/sys/compat/linux/arch/amd64/linux_sysent.c
index 9036c33c5405..af48f2ecac45 100644
--- a/sys/compat/linux/arch/amd64/linux_sysent.c
+++ b/sys/compat/linux/arch/amd64/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.58 2015/09/24 14:42:45 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.59 2015/10/27 07:16:00 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.56 2015/10/27 07:15:38 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.58 2015/09/24 14:42:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.59 2015/10/27 07:16:00 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
diff --git a/sys/compat/linux/arch/amd64/linux_systrace_args.c b/sys/compat/linux/arch/amd64/linux_systrace_args.c
index f763198fccf1..7cd3e014b609 100644
--- a/sys/compat/linux/arch/amd64/linux_systrace_args.c
+++ b/sys/compat/linux/arch/amd64/linux_systrace_args.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.3 2015/09/24 14:42:45 christos Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.4 2015/10/27 07:16:00 njoly Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -5168,12 +5168,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* sys_setuid */
 	case 105:
 		if (ndx == 0 || ndx == 1)
-			p = "void";
+			p = "int";
 		break;
 	/* sys_setgid */
 	case 106:
 		if (ndx == 0 || ndx == 1)
-			p = "void";
+			p = "int";
 		break;
 	/* sys_geteuid */
 	case 107: