diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index 8887697c837..8f79dda1acb 100644
--- a/sys/alpha/linux/linux_proto.h
+++ b/sys/alpha/linux/linux_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 7223d443c2f..27f69db5a77 100644
--- a/sys/alpha/linux/linux_syscall.h
+++ b/sys/alpha/linux/linux_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp 
  */
 
 #define	LINUX_SYS_exit	1
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index 3951b898a9e..54e45074570 100644
--- a/sys/alpha/linux/linux_sysent.c
+++ b/sys/alpha/linux/linux_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.58 2004/06/04 13:52:23 jhb Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.59 2004/08/24 20:21:21 jhb Exp 
  */
 
 #include "opt_compat.h"
@@ -109,7 +109,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_getdtablesize },	/* 89 = linux_getdtablesize */
 	{ SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2 },	/* 90 = dup2 */
 	{ AS(linux_newfstat_args), (sy_call_t *)linux_newfstat },	/* 91 = linux_newfstat */
-	{ AS(linux_fcntl_args), (sy_call_t *)linux_fcntl },	/* 92 = linux_fcntl */
+	{ SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl },	/* 92 = linux_fcntl */
 	{ AS(osf1_select_args), (sy_call_t *)osf1_select },	/* 93 = osf1_select */
 	{ AS(poll_args), (sy_call_t *)poll },		/* 94 = poll */
 	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
diff --git a/sys/alpha/osf1/osf1_proto.h b/sys/alpha/osf1/osf1_proto.h
index d830a2b290d..c12fd86146f 100644
--- a/sys/alpha/osf1/osf1_proto.h
+++ b/sys/alpha/osf1/osf1_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp 
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.10 2004/08/24 20:21:21 jhb Exp 
  */
 
 #ifndef _OSF1_SYSPROTO_H_
diff --git a/sys/alpha/osf1/osf1_syscall.h b/sys/alpha/osf1/osf1_syscall.h
index 52e820a7a1b..4410beba7cd 100644
--- a/sys/alpha/osf1/osf1_syscall.h
+++ b/sys/alpha/osf1/osf1_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp 
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.10 2004/08/24 20:21:21 jhb Exp 
  */
 
 #define	OSF1_SYS_nosys	0
diff --git a/sys/alpha/osf1/osf1_sysent.c b/sys/alpha/osf1/osf1_sysent.c
index 37c0a14185b..2da6509e2af 100644
--- a/sys/alpha/osf1/osf1_sysent.c
+++ b/sys/alpha/osf1/osf1_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp 
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.10 2004/08/24 20:21:21 jhb Exp 
  */
 
 #include "opt_compat.h"
@@ -110,7 +110,7 @@ struct sysent osf1_sysent[] = {
 	{ SYF_MPSAFE | 0, (sy_call_t *)getdtablesize },	/* 89 = getdtablesize */
 	{ SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2 },	/* 90 = dup2 */
 	{ AS(osf1_fstat_args), (sy_call_t *)osf1_fstat },	/* 91 = osf1_fstat */
-	{ AS(osf1_fcntl_args), (sy_call_t *)osf1_fcntl },	/* 92 = osf1_fcntl */
+	{ SYF_MPSAFE | AS(osf1_fcntl_args), (sy_call_t *)osf1_fcntl },	/* 92 = osf1_fcntl */
 	{ AS(osf1_select_args), (sy_call_t *)osf1_select },	/* 93 = osf1_select */
 	{ AS(poll_args), (sy_call_t *)poll },		/* 94 = poll */
 	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index 72c5ad52966..e166824f03d 100644
--- a/sys/compat/svr4/svr4_proto.h
+++ b/sys/compat/svr4/svr4_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp 
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.16 2004/08/24 20:21:21 jhb Exp 
  */
 
 #ifndef _SVR4_SYSPROTO_H_
diff --git a/sys/compat/svr4/svr4_syscall.h b/sys/compat/svr4/svr4_syscall.h
index f5ad7fedecb..b5a1c59ecc1 100644
--- a/sys/compat/svr4/svr4_syscall.h
+++ b/sys/compat/svr4/svr4_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp 
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.16 2004/08/24 20:21:21 jhb Exp 
  */
 
 #define	SVR4_SYS_exit	1
diff --git a/sys/compat/svr4/svr4_syscallnames.c b/sys/compat/svr4/svr4_syscallnames.c
index b2afa5cf81e..5fc4d0eb2d7 100644
--- a/sys/compat/svr4/svr4_syscallnames.c
+++ b/sys/compat/svr4/svr4_syscallnames.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp 
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.16 2004/08/24 20:21:21 jhb Exp 
  */
 
 const char *svr4_syscallnames[] = {
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 9d06e265466..a504c7bcf42 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.15 2004/02/06 20:07:33 jhb Exp 
+ * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.16 2004/08/24 20:21:21 jhb Exp 
  */
 
 #include <sys/types.h>
@@ -85,7 +85,7 @@ struct sysent svr4_sysent[] = {
 	{ AS(svr4_sys_execve_args), (sy_call_t *)svr4_sys_execve },	/* 59 = svr4_sys_execve */
 	{ SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
-	{ AS(svr4_sys_fcntl_args), (sy_call_t *)svr4_sys_fcntl },	/* 62 = svr4_sys_fcntl */
+	{ SYF_MPSAFE | AS(svr4_sys_fcntl_args), (sy_call_t *)svr4_sys_fcntl },	/* 62 = svr4_sys_fcntl */
 	{ SYF_MPSAFE | AS(svr4_sys_ulimit_args), (sy_call_t *)svr4_sys_ulimit },	/* 63 = svr4_sys_ulimit */
 	{ 0, (sy_call_t *)nosys },			/* 64 = reserved */
 	{ 0, (sy_call_t *)nosys },			/* 65 = reserved */
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index e1c68f2bcad..2275be6d76d 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -3,13 +3,14 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18 2004/03/28 22:51:01 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.19 2004/08/24 20:21:21 jhb Exp 
  */
 
 #ifndef _IBCS2_SYSPROTO_H_
 #define	_IBCS2_SYSPROTO_H_
 
 #include <sys/signal.h>
+#include <sys/acl.h>
 #include <sys/thr.h>
 #include <sys/umtx.h>
 #include <posix4/_semaphore.h>
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index 563b712b84d..d9e848a66c8 100644
--- a/sys/i386/ibcs2/ibcs2_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18 2004/03/28 22:51:01 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.19 2004/08/24 20:21:21 jhb Exp 
  */
 
 #define	IBCS2_SYS_syscall	0
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index 4d46451d06f..7d9a0588590 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.18 2004/03/28 22:51:01 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.19 2004/08/24 20:21:21 jhb Exp 
  */
 
 #include <sys/param.h>
@@ -84,7 +84,7 @@ struct sysent ibcs2_sysent[] = {
 	{ AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve },	/* 59 = ibcs2_execve */
 	{ SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
-	{ AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl },	/* 62 = ibcs2_fcntl */
+	{ SYF_MPSAFE | AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl },	/* 62 = ibcs2_fcntl */
 	{ SYF_MPSAFE | AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit },	/* 63 = ibcs2_ulimit */
 	{ 0, (sy_call_t *)nosys },			/* 64 = reserved for unix/pc */
 	{ 0, (sy_call_t *)nosys },			/* 65 = reserved for unix/pc */
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index fec6d446111..2206b6d2b47 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.55 2004/03/15 22:43:48 jhb Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.57 2004/08/24 20:21:21 jhb Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 73064d705c0..cb3fc7ff2cb 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.55 2004/03/15 22:43:48 jhb Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.57 2004/08/24 20:21:21 jhb Exp 
  */
 
 #define	LINUX_SYS_exit	1
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index a9ba557255f..b7e3548189a 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.55 2004/03/15 22:43:48 jhb Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.57 2004/08/24 20:21:21 jhb Exp 
  */
 
 #include "opt_compat.h"
@@ -72,7 +72,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_umount_args), (sy_call_t *)linux_umount },	/* 52 = linux_umount */
 	{ 0, (sy_call_t *)nosys },			/* 53 = lock */
 	{ AS(linux_ioctl_args), (sy_call_t *)linux_ioctl },	/* 54 = linux_ioctl */
-	{ AS(linux_fcntl_args), (sy_call_t *)linux_fcntl },	/* 55 = linux_fcntl */
+	{ SYF_MPSAFE | AS(linux_fcntl_args), (sy_call_t *)linux_fcntl },	/* 55 = linux_fcntl */
 	{ 0, (sy_call_t *)nosys },			/* 56 = mpx */
 	{ SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid },	/* 57 = setpgid */
 	{ 0, (sy_call_t *)nosys },			/* 58 = ulimit */
@@ -238,7 +238,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_mincore_args), (sy_call_t *)linux_mincore },	/* 218 = linux_mincore */
 	{ SYF_MPSAFE | AS(madvise_args), (sy_call_t *)madvise },	/* 219 = madvise */
 	{ AS(linux_getdents64_args), (sy_call_t *)linux_getdents64 },	/* 220 = linux_getdents64 */
-	{ AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64 },	/* 221 = linux_fcntl64 */
+	{ SYF_MPSAFE | AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64 },	/* 221 = linux_fcntl64 */
 	{ 0, (sy_call_t *)nosys },			/* 222 =  */
 	{ 0, (sy_call_t *)nosys },			/* 223 =  */
 	{ 0, (sy_call_t *)nosys },			/* 224 = linux_gettid */