regen after COMPAT_43 removal

15 files changed, 88 insertions, 46 deletions

diff --git a/sys/alpha/linux/linux_proto.h b/sys/alpha/linux/linux_proto.h
index b9f8ce5..4d844b8 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.66 2006/02/06 01:13:47 rwatson Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.67 2006/03/18 18:20:15 netchild Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -170,6 +170,10 @@ struct osf1_setitimer_args {
 struct linux_gethostname_args {
 	register_t dummy;
 };
+struct linux_sethostname_args {
+	char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
+	char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
+};
 struct linux_getdtablesize_args {
 	register_t dummy;
 };
@@ -231,6 +235,10 @@ struct linux_truncate_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)];
 };
+struct linux_ftruncate_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)];
+};
 struct osf1_sendto_args {
 	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
 	char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
@@ -620,6 +628,7 @@ int	linux_setgroups(struct thread *, struct linux_setgroups_args *);
 int	linux_getgroups(struct thread *, struct linux_getgroups_args *);
 int	osf1_setitimer(struct thread *, struct osf1_setitimer_args *);
 int	linux_gethostname(struct thread *, struct linux_gethostname_args *);
+int	linux_sethostname(struct thread *, struct linux_sethostname_args *);
 int	linux_getdtablesize(struct thread *, struct linux_getdtablesize_args *);
 int	linux_newfstat(struct thread *, struct linux_newfstat_args *);
 int	linux_fcntl(struct thread *, struct linux_fcntl_args *);
@@ -635,6 +644,7 @@ int	osf1_gettimeofday(struct thread *, struct osf1_gettimeofday_args *);
 int	osf1_getrusage(struct thread *, struct osf1_getrusage_args *);
 int	linux_rename(struct thread *, struct linux_rename_args *);
 int	linux_truncate(struct thread *, struct linux_truncate_args *);
+int	linux_ftruncate(struct thread *, struct linux_ftruncate_args *);
 int	osf1_sendto(struct thread *, struct osf1_sendto_args *);
 int	linux_socketpair(struct thread *, struct linux_socketpair_args *);
 int	linux_mkdir(struct thread *, struct linux_mkdir_args *);
diff --git a/sys/alpha/linux/linux_syscall.h b/sys/alpha/linux/linux_syscall.h
index 940494e..3de9846 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.66 2006/02/06 01:13:47 rwatson Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.67 2006/03/18 18:20:15 netchild Exp 
  */
 
 #define	LINUX_SYS_exit	1
@@ -57,7 +57,7 @@
 #define	LINUX_SYS_linux_getgroups	80
 #define	LINUX_SYS_osf1_setitimer	83
 #define	LINUX_SYS_linux_gethostname	87
-#define	LINUX_SYS_osethostname	88
+#define	LINUX_SYS_linux_sethostname	88
 #define	LINUX_SYS_linux_getdtablesize	89
 #define	LINUX_SYS_dup2	90
 #define	LINUX_SYS_linux_newfstat	91
@@ -91,7 +91,7 @@
 #define	LINUX_SYS_setregid	127
 #define	LINUX_SYS_linux_rename	128
 #define	LINUX_SYS_linux_truncate	129
-#define	LINUX_SYS_oftruncate	130
+#define	LINUX_SYS_linux_ftruncate	130
 #define	LINUX_SYS_flock	131
 #define	LINUX_SYS_setgid	132
 #define	LINUX_SYS_osf1_sendto	133
diff --git a/sys/alpha/linux/linux_sysent.c b/sys/alpha/linux/linux_sysent.c
index 08cc8fb..cec0196 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.66 2006/02/06 01:13:47 rwatson Exp 
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.67 2006/03/18 18:20:15 netchild Exp 
  */
 
 #include <bsm/audit_kevents.h>
@@ -108,7 +108,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 85 =  */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 86 = osf_getitimer */
 	{ SYF_MPSAFE | 0, (sy_call_t *)linux_gethostname, AUE_SYSCTL },	/* 87 = linux_gethostname */
-	{ SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL },	/* 88 = osethostname */
+	{ SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL },	/* 88 = linux_sethostname */
 	{ SYF_MPSAFE | 0, (sy_call_t *)linux_getdtablesize, AUE_GETDTABLESIZE },	/* 89 = linux_getdtablesize */
 	{ SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 },	/* 90 = dup2 */
 	{ SYF_MPSAFE | AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT },	/* 91 = linux_newfstat */
@@ -150,7 +150,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID },	/* 127 = setregid */
 	{ SYF_MPSAFE | AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME },	/* 128 = linux_rename */
 	{ SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE },	/* 129 = linux_truncate */
-	{ SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE },	/* 130 = oftruncate */
+	{ SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE },	/* 130 = linux_ftruncate */
 	{ SYF_MPSAFE | AS(flock_args), (sy_call_t *)flock, AUE_FLOCK },	/* 131 = flock */
 	{ SYF_MPSAFE | AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID },	/* 132 = setgid */
 	{ SYF_MPSAFE | AS(osf1_sendto_args), (sy_call_t *)osf1_sendto, AUE_SENDTO },	/* 133 = osf1_sendto */
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 61f7875..334e252 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -29,13 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/* XXX we use functions that might not exist. */
-#include "opt_compat.h"
-
-#ifndef COMPAT_43
-#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/exec.h>
diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h
index 7362b22..c571597 100644
--- a/sys/amd64/linux32/linux.h
+++ b/sys/amd64/linux32/linux.h
@@ -197,6 +197,24 @@ struct l_newstat {
 	l_ulong		__unused5;
 } __packed;
 
+struct l_stat {
+       l_ushort        st_dev;
+       l_ulong         st_ino;
+       l_ushort        st_mode;
+       l_ushort        st_nlink;
+       l_ushort        st_uid;
+       l_ushort        st_gid;
+       l_ushort        st_rdev;
+       l_long          st_size;
+       struct l_timespec       st_atimespec;
+       struct l_timespec       st_mtimespec;
+       struct l_timespec       st_ctimespec;
+       l_long          st_blksize;
+       l_long          st_blocks;
+       l_ulong         st_flags;
+       l_ulong         st_gen;
+};
+
 struct l_stat64 {
 	l_ushort	st_dev;
 	u_char		__pad0[10];
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 4cdbaff..b9f4f9a 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp 
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.6 2006/03/18 18:20:16 netchild Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -220,6 +220,10 @@ struct linux_sigsuspend_args {
 struct linux_sigpending_args {
 	char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)];
 };
+struct linux_sethostname_args {
+	char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
+	char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
+};
 struct linux_setrlimit_args {
 	char resource_l_[PADL_(l_uint)]; l_uint resource; char resource_r_[PADR_(l_uint)];
 	char rlim_l_[PADL_(struct l_rlimit *)]; struct l_rlimit * rlim; char rlim_r_[PADR_(struct l_rlimit *)];
@@ -255,6 +259,10 @@ struct linux_symlink_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)];
 };
+struct linux_stat_args {
+	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+	char up_l_[PADL_(struct l_stat *)]; struct l_stat * up; char up_r_[PADR_(struct l_stat *)];
+};
 struct linux_readlink_args {
 	char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
 	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
@@ -278,6 +286,10 @@ struct linux_truncate_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char length_l_[PADL_(l_ulong)]; l_ulong length; char length_r_[PADR_(l_ulong)];
 };
+struct linux_ftruncate_args {
+	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+	char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)];
+};
 struct linux_getpriority_args {
 	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
 	char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
@@ -740,6 +752,7 @@ int	linux_setreuid16(struct thread *, struct linux_setreuid16_args *);
 int	linux_setregid16(struct thread *, struct linux_setregid16_args *);
 int	linux_sigsuspend(struct thread *, struct linux_sigsuspend_args *);
 int	linux_sigpending(struct thread *, struct linux_sigpending_args *);
+int	linux_sethostname(struct thread *, struct linux_sethostname_args *);
 int	linux_setrlimit(struct thread *, struct linux_setrlimit_args *);
 int	linux_old_getrlimit(struct thread *, struct linux_old_getrlimit_args *);
 int	linux_getrusage(struct thread *, struct linux_getrusage_args *);
@@ -749,11 +762,13 @@ int	linux_getgroups16(struct thread *, struct linux_getgroups16_args *);
 int	linux_setgroups16(struct thread *, struct linux_setgroups16_args *);
 int	linux_old_select(struct thread *, struct linux_old_select_args *);
 int	linux_symlink(struct thread *, struct linux_symlink_args *);
+int	linux_stat(struct thread *, struct linux_stat_args *);
 int	linux_readlink(struct thread *, struct linux_readlink_args *);
 int	linux_reboot(struct thread *, struct linux_reboot_args *);
 int	linux_readdir(struct thread *, struct linux_readdir_args *);
 int	linux_mmap(struct thread *, struct linux_mmap_args *);
 int	linux_truncate(struct thread *, struct linux_truncate_args *);
+int	linux_ftruncate(struct thread *, struct linux_ftruncate_args *);
 int	linux_getpriority(struct thread *, struct linux_getpriority_args *);
 int	linux_statfs(struct thread *, struct linux_statfs_args *);
 int	linux_fstatfs(struct thread *, struct linux_fstatfs_args *);
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index 2dc6198..31676ee 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp 
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.6 2006/03/18 18:20:16 netchild Exp 
  */
 
 #define	LINUX_SYS_exit	1
@@ -69,7 +69,7 @@
 #define	LINUX_SYS_linux_setregid16	71
 #define	LINUX_SYS_linux_sigsuspend	72
 #define	LINUX_SYS_linux_sigpending	73
-#define	LINUX_SYS_osethostname	74
+#define	LINUX_SYS_linux_sethostname	74
 #define	LINUX_SYS_linux_setrlimit	75
 #define	LINUX_SYS_linux_old_getrlimit	76
 #define	LINUX_SYS_linux_getrusage	77
@@ -79,6 +79,7 @@
 #define	LINUX_SYS_linux_setgroups16	81
 #define	LINUX_SYS_linux_old_select	82
 #define	LINUX_SYS_linux_symlink	83
+#define	LINUX_SYS_linux_stat	84
 #define	LINUX_SYS_linux_readlink	85
 #define	LINUX_SYS_swapon	87
 #define	LINUX_SYS_linux_reboot	88
@@ -86,7 +87,7 @@
 #define	LINUX_SYS_linux_mmap	90
 #define	LINUX_SYS_munmap	91
 #define	LINUX_SYS_linux_truncate	92
-#define	LINUX_SYS_oftruncate	93
+#define	LINUX_SYS_linux_ftruncate	93
 #define	LINUX_SYS_fchmod	94
 #define	LINUX_SYS_fchown	95
 #define	LINUX_SYS_linux_getpriority	96
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 6c7d956..ac79bb9 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -3,11 +3,10 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.5 2005/07/13 20:32:42 jhb Exp 
+ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.6 2006/03/18 18:20:16 netchild Exp 
  */
 
 #include <bsm/audit_kevents.h>
-#include "opt_compat.h"
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
@@ -94,7 +93,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_NULL },	/* 71 = linux_setregid16 */
 	{ SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL },	/* 72 = linux_sigsuspend */
 	{ SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL },	/* 73 = linux_sigpending */
-	{ SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_NULL },	/* 74 = osethostname */
+	{ SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_NULL },	/* 74 = linux_sethostname */
 	{ SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_NULL },	/* 75 = linux_setrlimit */
 	{ SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_NULL },	/* 76 = linux_old_getrlimit */
 	{ SYF_MPSAFE | AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_NULL },	/* 77 = linux_getrusage */
@@ -104,7 +103,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_NULL },	/* 81 = linux_setgroups16 */
 	{ SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_NULL },	/* 82 = linux_old_select */
 	{ SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_NULL },	/* 83 = linux_symlink */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 84 = ostat */
+	{ SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_NULL },	/* 84 = linux_stat */
 	{ SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_NULL },	/* 85 = linux_readlink */
 	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 86 = linux_uselib */
 	{ SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_NULL },	/* 87 = swapon */
@@ -113,7 +112,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_NULL },	/* 90 = linux_mmap */
 	{ SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_NULL },	/* 91 = munmap */
 	{ SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_NULL },	/* 92 = linux_truncate */
-	{ SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_NULL },	/* 93 = oftruncate */
+	{ SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_NULL },	/* 93 = linux_ftruncate */
 	{ SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_NULL },	/* 94 = fchmod */
 	{ SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_NULL },	/* 95 = fchown */
 	{ SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_NULL },	/* 96 = linux_getpriority */
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 31d2cb8..e7e88cb 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -36,9 +36,6 @@ __FBSDID("$FreeBSD$");
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
 
-#ifndef COMPAT_43
-#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
-#endif
 #ifndef COMPAT_IA32
 #error "Unable to compile Linux-emulator due to missing COMPAT_IA32 option!"
 #endif
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h
index 6ca77b3..08a76f3 100644
--- a/sys/i386/linux/linux.h
+++ b/sys/i386/linux/linux.h
@@ -170,6 +170,24 @@ struct l_newstat {
 	l_ulong		__unused5;
 };
 
+struct l_stat {
+	l_ushort        st_dev;
+	l_ulong         st_ino;
+	l_ushort        st_mode;
+	l_ushort        st_nlink;
+	l_ushort        st_uid;
+	l_ushort        st_gid;
+	l_ushort        st_rdev;
+	l_long          st_size;
+	struct l_timespec       st_atimespec;
+	struct l_timespec       st_mtimespec;
+	struct l_timespec       st_ctimespec;
+	l_long          st_blksize;
+	l_long          st_blocks;
+	l_ulong         st_flags;
+	l_ulong         st_gen;
+};
+
 struct l_stat64 {
 	l_ushort	st_dev;
 	u_char		__pad0[10];
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index 0ff2460..e97c5fa 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <i386/linux/linux_proto.h>
 #include <compat/linux/linux_util.h>
 
-DUMMY(stat);
 DUMMY(stime);
 DUMMY(fstat);
 DUMMY(olduname);
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index c06d41e..0bbb95d 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.63 2006/02/06 01:40:30 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
@@ -84,7 +84,7 @@ struct linux_lchown16_args {
 };
 struct linux_stat_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char up_l_[PADL_(struct ostat *)]; struct ostat * up; char up_r_[PADR_(struct ostat *)];
+	char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
 };
 struct linux_lseek_args {
 	char fdes_l_[PADL_(l_uint)]; l_uint fdes; char fdes_r_[PADR_(l_uint)];
@@ -124,7 +124,7 @@ struct linux_alarm_args {
 };
 struct linux_fstat_args {
 	char fd_l_[PADL_(l_uint)]; l_uint fd; char fd_r_[PADR_(l_uint)];
-	char up_l_[PADL_(struct ostat *)]; struct ostat * up; char up_r_[PADR_(struct ostat *)];
+	char up_l_[PADL_(struct linux_stat *)]; struct linux_stat * up; char up_r_[PADR_(struct linux_stat *)];
 };
 struct linux_pause_args {
 	register_t dummy;
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 8ecddd0..bda5a11 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.63 2006/02/06 01:40:30 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp 
  */
 
 #define	LINUX_SYS_exit	1
@@ -71,7 +71,7 @@
 #define	LINUX_SYS_linux_setregid16	71
 #define	LINUX_SYS_linux_sigsuspend	72
 #define	LINUX_SYS_linux_sigpending	73
-#define	LINUX_SYS_osethostname	74
+#define	LINUX_SYS_linux_sethostname	74
 #define	LINUX_SYS_linux_setrlimit	75
 #define	LINUX_SYS_linux_old_getrlimit	76
 #define	LINUX_SYS_getrusage	77
@@ -81,7 +81,7 @@
 #define	LINUX_SYS_linux_setgroups16	81
 #define	LINUX_SYS_linux_old_select	82
 #define	LINUX_SYS_linux_symlink	83
-#define	LINUX_SYS_ostat	84
+#define	LINUX_SYS_linux_stat	84
 #define	LINUX_SYS_linux_readlink	85
 #define	LINUX_SYS_linux_uselib	86
 #define	LINUX_SYS_swapon	87
@@ -90,7 +90,7 @@
 #define	LINUX_SYS_linux_mmap	90
 #define	LINUX_SYS_munmap	91
 #define	LINUX_SYS_linux_truncate	92
-#define	LINUX_SYS_oftruncate	93
+#define	LINUX_SYS_linux_ftruncate	93
 #define	LINUX_SYS_fchmod	94
 #define	LINUX_SYS_fchown	95
 #define	LINUX_SYS_linux_getpriority	96
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 741b8ae..df1cee6 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -3,11 +3,10 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.63 2006/02/06 01:40:30 rwatson Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.64 2006/03/18 18:20:16 netchild Exp 
  */
 
 #include <bsm/audit_kevents.h>
-#include "opt_compat.h"
 #include <sys/param.h>
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
@@ -94,7 +93,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID },	/* 71 = linux_setregid16 */
 	{ SYF_MPSAFE | AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL },	/* 72 = linux_sigsuspend */
 	{ SYF_MPSAFE | AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL },	/* 73 = linux_sigpending */
-	{ SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname, AUE_SYSCTL },	/* 74 = osethostname */
+	{ SYF_MPSAFE | AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL },	/* 74 = linux_sethostname */
 	{ SYF_MPSAFE | AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT },	/* 75 = linux_setrlimit */
 	{ SYF_MPSAFE | AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT },	/* 76 = linux_old_getrlimit */
 	{ SYF_MPSAFE | AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE },	/* 77 = getrusage */
@@ -104,7 +103,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS },	/* 81 = linux_setgroups16 */
 	{ SYF_MPSAFE | AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT },	/* 82 = linux_old_select */
 	{ SYF_MPSAFE | AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK },	/* 83 = linux_symlink */
-	{ SYF_MPSAFE | AS(ostat_args), (sy_call_t *)ostat, AUE_STAT },	/* 84 = ostat */
+	{ SYF_MPSAFE | AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT },	/* 84 = linux_stat */
 	{ SYF_MPSAFE | AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK },	/* 85 = linux_readlink */
 	{ AS(linux_uselib_args), (sy_call_t *)linux_uselib, AUE_USELIB },	/* 86 = linux_uselib */
 	{ SYF_MPSAFE | AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON },	/* 87 = swapon */
@@ -113,7 +112,7 @@ struct sysent linux_sysent[] = {
 	{ SYF_MPSAFE | AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP },	/* 90 = linux_mmap */
 	{ SYF_MPSAFE | AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP },	/* 91 = munmap */
 	{ SYF_MPSAFE | AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE },	/* 92 = linux_truncate */
-	{ SYF_MPSAFE | AS(oftruncate_args), (sy_call_t *)oftruncate, AUE_FTRUNCATE },	/* 93 = oftruncate */
+	{ SYF_MPSAFE | AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE },	/* 93 = linux_ftruncate */
 	{ SYF_MPSAFE | AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD },	/* 94 = fchmod */
 	{ SYF_MPSAFE | AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN },	/* 95 = fchown */
 	{ SYF_MPSAFE | AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY },	/* 96 = linux_getpriority */
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 1335f9a..0333acb 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -29,13 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/* XXX we use functions that might not exist. */
-#include "opt_compat.h"
-
-#ifndef COMPAT_43
-#error "Unable to compile Linux-emulator due to missing COMPAT_43 option!"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/exec.h>