From d7efe85816b8e2a31c00b94e95ec01c4eaa3fab6 Mon Sep 17 00:00:00 2001
From: njoly <njoly@NetBSD.org>
Date: Sat, 31 May 2014 08:52:54 +0000
Subject: [PATCH] Regen for munmap(2) signature.

---
 sys/compat/linux/arch/amd64/linux_syscall.h       |  6 +++---
 sys/compat/linux/arch/amd64/linux_syscallargs.h   |  4 ++--
 sys/compat/linux/arch/amd64/linux_syscalls.c      |  6 +++---
 sys/compat/linux/arch/amd64/linux_sysent.c        |  6 +++---
 sys/compat/linux/arch/arm/linux_syscall.h         |  6 +++---
 sys/compat/linux/arch/arm/linux_syscallargs.h     |  4 ++--
 sys/compat/linux/arch/arm/linux_syscalls.c        |  6 +++---
 sys/compat/linux/arch/arm/linux_sysent.c          |  6 +++---
 sys/compat/linux/arch/i386/linux_syscall.h        |  6 +++---
 sys/compat/linux/arch/i386/linux_syscallargs.h    |  4 ++--
 sys/compat/linux/arch/i386/linux_syscalls.c       |  6 +++---
 sys/compat/linux/arch/i386/linux_sysent.c         |  6 +++---
 sys/compat/linux/arch/m68k/linux_syscall.h        |  6 +++---
 sys/compat/linux/arch/m68k/linux_syscallargs.h    |  4 ++--
 sys/compat/linux/arch/m68k/linux_syscalls.c       |  6 +++---
 sys/compat/linux/arch/m68k/linux_sysent.c         |  6 +++---
 sys/compat/linux/arch/mips/linux_syscall.h        |  6 +++---
 sys/compat/linux/arch/mips/linux_syscallargs.h    |  4 ++--
 sys/compat/linux/arch/mips/linux_syscalls.c       |  6 +++---
 sys/compat/linux/arch/mips/linux_sysent.c         |  6 +++---
 sys/compat/linux/arch/powerpc/linux_syscall.h     |  8 ++++----
 sys/compat/linux/arch/powerpc/linux_syscallargs.h | 12 ++++--------
 sys/compat/linux/arch/powerpc/linux_syscalls.c    |  6 +++---
 sys/compat/linux/arch/powerpc/linux_sysent.c      | 10 +++++-----
 24 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/sys/compat/linux/arch/amd64/linux_syscall.h b/sys/compat/linux/arch/amd64/linux_syscall.h
index 0168616c0362..c8d47696672c 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.53 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.54 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -45,7 +45,7 @@
 /* syscall: "mprotect" ret: "int" args: "const void *" "unsigned long" "int" */
 #define	LINUX_SYS_mprotect	10
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	11
 
 /* syscall: "brk" ret: "int" args: "char *" */
diff --git a/sys/compat/linux/arch/amd64/linux_syscallargs.h b/sys/compat/linux/arch/amd64/linux_syscallargs.h
index ecd259434cf4..c5b0175a40a2 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.53 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.54 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 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 58be39110581..6dd57b235f92 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.53 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.54 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.53 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.54 2014/05/31 08:52:54 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 12b74dd7171d..6e854a8f9342 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.53 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.54 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.53 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.54 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
diff --git a/sys/compat/linux/arch/arm/linux_syscall.h b/sys/compat/linux/arch/arm/linux_syscall.h
index c269652fda5d..9ac1decb2276 100644
--- a/sys/compat/linux/arch/arm/linux_syscall.h
+++ b/sys/compat/linux/arch/arm/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.63 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.64 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -258,7 +258,7 @@
 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */
 #define	LINUX_SYS_old_mmap	90
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	91
 
 /* syscall: "truncate" ret: "int" args: "const char *" "long" */
diff --git a/sys/compat/linux/arch/arm/linux_syscallargs.h b/sys/compat/linux/arch/arm/linux_syscallargs.h
index 337649a7c34c..862ffd4b0f40 100644
--- a/sys/compat/linux/arch/arm/linux_syscallargs.h
+++ b/sys/compat/linux/arch/arm/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.63 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.64 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
diff --git a/sys/compat/linux/arch/arm/linux_syscalls.c b/sys/compat/linux/arch/arm/linux_syscalls.c
index 29bd60d4c17d..e62e2163da29 100644
--- a/sys/compat/linux/arch/arm/linux_syscalls.c
+++ b/sys/compat/linux/arch/arm/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.63 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.64 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.63 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.64 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
diff --git a/sys/compat/linux/arch/arm/linux_sysent.c b/sys/compat/linux/arch/arm/linux_sysent.c
index fe8afd51a2d6..21cc53d47ec3 100644
--- a/sys/compat/linux/arch/arm/linux_sysent.c
+++ b/sys/compat/linux/arch/arm/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.63 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.64 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.63 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.64 2014/05/31 08:52:54 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
diff --git a/sys/compat/linux/arch/i386/linux_syscall.h b/sys/compat/linux/arch/i386/linux_syscall.h
index b40230a9c325..8a3c93d614f6 100644
--- a/sys/compat/linux/arch/i386/linux_syscall.h
+++ b/sys/compat/linux/arch/i386/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.102 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.103 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -259,7 +259,7 @@
 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */
 #define	LINUX_SYS_old_mmap	90
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	91
 
 /* syscall: "truncate" ret: "int" args: "const char *" "long" */
diff --git a/sys/compat/linux/arch/i386/linux_syscallargs.h b/sys/compat/linux/arch/i386/linux_syscallargs.h
index 4bcf5fe7f190..53e42819d526 100644
--- a/sys/compat/linux/arch/i386/linux_syscallargs.h
+++ b/sys/compat/linux/arch/i386/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.102 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.103 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
diff --git a/sys/compat/linux/arch/i386/linux_syscalls.c b/sys/compat/linux/arch/i386/linux_syscalls.c
index e2da14888404..57faa3736834 100644
--- a/sys/compat/linux/arch/i386/linux_syscalls.c
+++ b/sys/compat/linux/arch/i386/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.103 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.104 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.103 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.104 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
diff --git a/sys/compat/linux/arch/i386/linux_sysent.c b/sys/compat/linux/arch/i386/linux_sysent.c
index 15ec250f0138..97226b686a68 100644
--- a/sys/compat/linux/arch/i386/linux_sysent.c
+++ b/sys/compat/linux/arch/i386/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.102 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.103 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.102 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.103 2014/05/31 08:52:54 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
diff --git a/sys/compat/linux/arch/m68k/linux_syscall.h b/sys/compat/linux/arch/m68k/linux_syscall.h
index 199a5f48b1ec..0d1b4a96863f 100644
--- a/sys/compat/linux/arch/m68k/linux_syscall.h
+++ b/sys/compat/linux/arch/m68k/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.93 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.94 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -263,7 +263,7 @@
 /* syscall: "old_mmap" ret: "int" args: "struct linux_oldmmap *" */
 #define	LINUX_SYS_old_mmap	90
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	91
 
 /* syscall: "truncate" ret: "int" args: "const char *" "long" */
diff --git a/sys/compat/linux/arch/m68k/linux_syscallargs.h b/sys/compat/linux/arch/m68k/linux_syscallargs.h
index f93aaf55850f..71863527139d 100644
--- a/sys/compat/linux/arch/m68k/linux_syscallargs.h
+++ b/sys/compat/linux/arch/m68k/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.92 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.93 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
diff --git a/sys/compat/linux/arch/m68k/linux_syscalls.c b/sys/compat/linux/arch/m68k/linux_syscalls.c
index 45b16ad01e0e..6f516647d3b7 100644
--- a/sys/compat/linux/arch/m68k/linux_syscalls.c
+++ b/sys/compat/linux/arch/m68k/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.93 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.94 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.93 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.94 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
diff --git a/sys/compat/linux/arch/m68k/linux_sysent.c b/sys/compat/linux/arch/m68k/linux_sysent.c
index 94c8a1126a76..6bd708c387e5 100644
--- a/sys/compat/linux/arch/m68k/linux_sysent.c
+++ b/sys/compat/linux/arch/m68k/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.93 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.94 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp
+ * created from	NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.93 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.94 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
diff --git a/sys/compat/linux/arch/mips/linux_syscall.h b/sys/compat/linux/arch/mips/linux_syscall.h
index 15ad9400ce56..31993cbc0756 100644
--- a/sys/compat/linux/arch/mips/linux_syscall.h
+++ b/sys/compat/linux/arch/mips/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.60 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.61 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2014/05/29 10:35:27 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp  
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -241,7 +241,7 @@
 /* syscall: "mmap" ret: "int" args: "unsigned long" "size_t" "int" "int" "int" "linux_off_t" */
 #define	LINUX_SYS_mmap	90
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	91
 
 /* syscall: "truncate" ret: "int" args: "const char *" "long" */
diff --git a/sys/compat/linux/arch/mips/linux_syscallargs.h b/sys/compat/linux/arch/mips/linux_syscallargs.h
index d593bdbb0457..1717ca23e78f 100644
--- a/sys/compat/linux/arch/mips/linux_syscallargs.h
+++ b/sys/compat/linux/arch/mips/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.59 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.60 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2014/05/29 10:35:27 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp  
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
diff --git a/sys/compat/linux/arch/mips/linux_syscalls.c b/sys/compat/linux/arch/mips/linux_syscalls.c
index 0a28ad401a3f..61c47b86e4bc 100644
--- a/sys/compat/linux/arch/mips/linux_syscalls.c
+++ b/sys/compat/linux/arch/mips/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.59 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.60 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2014/05/29 10:35:27 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp  
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.59 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.60 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
diff --git a/sys/compat/linux/arch/mips/linux_sysent.c b/sys/compat/linux/arch/mips/linux_sysent.c
index e1cacf2b45f2..daf346c43946 100644
--- a/sys/compat/linux/arch/mips/linux_sysent.c
+++ b/sys/compat/linux/arch/mips/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.59 2014/05/29 10:36:31 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.60 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.55 2014/05/29 10:35:27 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.56 2014/05/31 08:51:19 njoly Exp  
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.59 2014/05/29 10:36:31 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.60 2014/05/31 08:52:54 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
diff --git a/sys/compat/linux/arch/powerpc/linux_syscall.h b/sys/compat/linux/arch/powerpc/linux_syscall.h
index 47b40859ce10..5fec0e4e3239 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscall.h
+++ b/sys/compat/linux/arch/powerpc/linux_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.69 2014/05/20 17:26:04 njoly Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.70 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.63 2014/05/20 17:24:49 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp  
  */
 
 #ifndef _LINUX_SYS_SYSCALL_H_
@@ -257,7 +257,7 @@
 /* syscall: "mmap" ret: "int" args: "unsigned long" "size_t" "int" "int" "int" "linux_off_t" */
 #define	LINUX_SYS_mmap	90
 
-/* syscall: "munmap" ret: "int" args: "void *" "int" */
+/* syscall: "munmap" ret: "int" args: "void *" "size_t" */
 #define	LINUX_SYS_munmap	91
 
 /* syscall: "truncate" ret: "int" args: "const char *" "long" */
@@ -588,7 +588,7 @@
 /* syscall: "tgkill" ret: "int" args: "int" "int" "int" */
 #define	LINUX_SYS_tgkill	250
 
-/* syscall: "utimes" ret: "int" args: "const char *" "struct linux_timeval *" */
+/* syscall: "utimes" ret: "int" args: "const char *" "const struct timeval50 *" */
 #define	LINUX_SYS_utimes	251
 
 /* syscall: "statfs64" ret: "int" args: "const char *" "size_t" "struct linux_statfs64 *" */
diff --git a/sys/compat/linux/arch/powerpc/linux_syscallargs.h b/sys/compat/linux/arch/powerpc/linux_syscallargs.h
index a399a1cfeddd..e9e6b4a30aad 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscallargs.h
+++ b/sys/compat/linux/arch/powerpc/linux_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.68 2014/05/20 17:26:04 njoly Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.69 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.63 2014/05/20 17:24:49 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp  
  */
 
 #ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -877,11 +877,7 @@ struct linux_sys_tgkill_args {
 };
 check_syscall_args(linux_sys_tgkill)
 
-struct linux_sys_utimes_args {
-	syscallarg(const char *) path;
-	syscallarg(struct linux_timeval *) times;
-};
-check_syscall_args(linux_sys_utimes)
+struct compat_50_sys_utimes_args;
 
 struct linux_sys_statfs64_args {
 	syscallarg(const char *) path;
@@ -1400,7 +1396,7 @@ int	linux_sys_clock_nanosleep(struct lwp *, const struct linux_sys_clock_nanosle
 
 int	linux_sys_tgkill(struct lwp *, const struct linux_sys_tgkill_args *, register_t *);
 
-int	linux_sys_utimes(struct lwp *, const struct linux_sys_utimes_args *, register_t *);
+int	compat_50_sys_utimes(struct lwp *, const struct compat_50_sys_utimes_args *, register_t *);
 
 int	linux_sys_statfs64(struct lwp *, const struct linux_sys_statfs64_args *, register_t *);
 
diff --git a/sys/compat/linux/arch/powerpc/linux_syscalls.c b/sys/compat/linux/arch/powerpc/linux_syscalls.c
index f3d1ef3aa7ff..9be940115acb 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscalls.c
+++ b/sys/compat/linux/arch/powerpc/linux_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.68 2014/05/20 17:26:04 njoly Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.69 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.63 2014/05/20 17:24:49 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp  
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.68 2014/05/20 17:26:04 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.69 2014/05/31 08:52:54 njoly Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
diff --git a/sys/compat/linux/arch/powerpc/linux_sysent.c b/sys/compat/linux/arch/powerpc/linux_sysent.c
index aba8910a0d91..c9efd375c50a 100644
--- a/sys/compat/linux/arch/powerpc/linux_sysent.c
+++ b/sys/compat/linux/arch/powerpc/linux_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.69 2014/05/20 17:26:04 njoly Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.70 2014/05/31 08:52:54 njoly Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.63 2014/05/20 17:24:49 njoly Exp  
+ * created from	NetBSD: syscalls.master,v 1.65 2014/05/31 08:51:19 njoly Exp  
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.69 2014/05/20 17:26:04 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.70 2014/05/31 08:52:54 njoly Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -536,8 +536,8 @@ struct sysent linux_sysent[] = {
 	    linux_sys_nosys },			/* 249 = unimplemented swapcontext */
 	{ ns(struct linux_sys_tgkill_args), 0,
 	    (sy_call_t *)linux_sys_tgkill },	/* 250 = tgkill */
-	{ ns(struct linux_sys_utimes_args), SYCALL_ARG_PTR,
-	    (sy_call_t *)linux_sys_utimes },	/* 251 = utimes */
+	{ ns(struct compat_50_sys_utimes_args), SYCALL_ARG_PTR,
+	    (sy_call_t *)compat_50_sys_utimes },/* 251 = utimes */
 	{ ns(struct linux_sys_statfs64_args), SYCALL_ARG_PTR,
 	    (sy_call_t *)linux_sys_statfs64 },	/* 252 = statfs64 */
 	{ ns(struct linux_sys_fstatfs64_args), SYCALL_ARG_PTR,