Don't use compatability syscall wrappers in emulation code.

This is needed for the COMPAT_FREEBSD3 option split.

Reviewed by:	alfred, jake

4 files changed, 14 insertions, 10 deletions

diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index d98c9dd..79c0636 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -223,6 +223,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 *)];
@@ -691,6 +695,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_getgroups16(struct thread *, struct linux_getgroups16_args *);
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 3020d54..ca80aee 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -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_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_ftruncate	93
 #define	LINUX_SYS_fchmod	94
 #define	LINUX_SYS_fchown	95
 #define	LINUX_SYS_getpriority	96
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 608a9e3..f35c7b2 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -91,7 +91,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_setregid16_args), (sy_call_t *)linux_setregid16 },	/* 71 = linux_setregid16 */
 	{ AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend },	/* 72 = linux_sigsuspend */
 	{ AS(linux_sigpending_args), (sy_call_t *)linux_sigpending },	/* 73 = linux_sigpending */
-	{ SYF_MPSAFE | AS(sethostname_args), (sy_call_t *)osethostname },	/* 74 = osethostname */
+	{ AS(linux_sethostname_args), (sy_call_t *)linux_sethostname },	/* 74 = linux_sethostname */
 	{ AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit },	/* 75 = linux_setrlimit */
 	{ AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit },	/* 76 = linux_old_getrlimit */
 	{ AS(getrusage_args), (sy_call_t *)getrusage },	/* 77 = getrusage */
@@ -101,7 +101,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16 },	/* 81 = linux_setgroups16 */
 	{ AS(linux_old_select_args), (sy_call_t *)linux_old_select },	/* 82 = linux_old_select */
 	{ AS(linux_symlink_args), (sy_call_t *)linux_symlink },	/* 83 = linux_symlink */
-	{ AS(ostat_args), (sy_call_t *)ostat },		/* 84 = ostat */
+	{ AS(stat_args), (sy_call_t *)stat },		/* 84 = stat */
 	{ AS(linux_readlink_args), (sy_call_t *)linux_readlink },	/* 85 = linux_readlink */
 	{ AS(linux_uselib_args), (sy_call_t *)linux_uselib },	/* 86 = linux_uselib */
 	{ AS(swapon_args), (sy_call_t *)swapon },	/* 87 = swapon */
@@ -110,7 +110,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_mmap_args), (sy_call_t *)linux_mmap },	/* 90 = linux_mmap */
 	{ AS(munmap_args), (sy_call_t *)munmap },	/* 91 = munmap */
 	{ AS(linux_truncate_args), (sy_call_t *)linux_truncate },	/* 92 = linux_truncate */
-	{ AS(oftruncate_args), (sy_call_t *)oftruncate },	/* 93 = oftruncate */
+	{ AS(ftruncate_args), (sy_call_t *)ftruncate },	/* 93 = ftruncate */
 	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 94 = fchmod */
 	{ AS(fchown_args), (sy_call_t *)fchown },	/* 95 = fchown */
 	{ AS(getpriority_args), (sy_call_t *)getpriority },	/* 96 = getpriority */
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index ea790c7..150d2a8 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -121,8 +121,7 @@
 72	STD	LINUX	{ int linux_sigsuspend(l_int hist0, l_int hist1, \
 				l_osigset_t mask); }
 73	STD	LINUX	{ int linux_sigpending(l_osigset_t *mask); }
-74	MNOPROTO LINUX	{ int osethostname(char *hostname, u_int len); } \
-			    osethostname sethostname_args int
+74	STD	LINUX	{ int linux_sethostname(char *hostname, u_int len); }
 75	STD	LINUX	{ int linux_setrlimit(l_uint resource, \
 				struct l_rlimit *rlim); }
 76	STD	LINUX	{ int linux_old_getrlimit(l_uint resource, \
@@ -139,7 +138,7 @@
 82	STD	LINUX	{ int linux_old_select(struct l_old_select_argv \
 				*ptr); }
 83	STD	LINUX	{ int linux_symlink(char *path, char *to); }
-84	NOPROTO	LINUX	{ int ostat(char *path, struct ostat *up); }
+84	NOPROTO	LINUX	{ int stat(char *path, struct ostat *up); }
 85	STD	LINUX	{ int linux_readlink(char *name, char *buf, \
 				l_int count); }
 86	STD	LINUX	{ int linux_uselib(char *library); }
@@ -151,7 +150,7 @@
 90	STD	LINUX	{ int linux_mmap(struct l_mmap_argv *ptr); }
 91	NOPROTO	LINUX	{ int munmap(caddr_t addr, int len); }
 92	STD	LINUX	{ int linux_truncate(char *path, l_ulong length); }
-93	NOPROTO	LINUX	{ int oftruncate(int fd, long length); }
+93	NOPROTO	LINUX	{ int ftruncate(int fd, long length); }
 94	NOPROTO	LINUX	{ int fchmod(int fd, int mode); }
 95	NOPROTO	LINUX	{ int fchown(int fd, int uid, int gid); }
 96	NOPROTO	LINUX	{ int getpriority(int which, int who); }