Regen

4 files changed, 411 insertions, 411 deletions

diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 3d28824..0051ffc 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -3,11 +3,11 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.23 2003/08/21 03:48:05 peter Exp 
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.24 2003/08/22 22:51:48 peter Exp 
  */
 
-#ifndef _IA32_SYSPROTO_H_
-#define	_IA32_SYSPROTO_H_
+#ifndef _FREEBSD32_SYSPROTO_H_
+#define	_FREEBSD32_SYSPROTO_H_
 
 #include <sys/signal.h>
 #include <sys/acl.h>
@@ -32,97 +32,97 @@ struct thread;
 #define	PADR_(t)	0
 #endif
 
-struct ia32_open_args {
+struct freebsd32_open_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
 };
-struct ia32_wait4_args {
+struct freebsd32_wait4_args {
 	char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
 	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
 	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
 	char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)];
 };
-struct ia32_getfsstat_args {
+struct freebsd32_getfsstat_args {
 	char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
 	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
-struct ia32_access_args {
+struct freebsd32_access_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
-struct ia32_chflags_args {
+struct freebsd32_chflags_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
-struct ia32_sigaltstack_args {
+struct freebsd32_sigaltstack_args {
 	char ss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * ss; char ss_r_[PADR_(struct sigaltstack32 *)];
 	char oss_l_[PADL_(struct sigaltstack32 *)]; struct sigaltstack32 * oss; char oss_r_[PADR_(struct sigaltstack32 *)];
 };
-struct ia32_execve_args {
+struct freebsd32_execve_args {
 	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
 	char argv_l_[PADL_(u_int32_t *)]; u_int32_t * argv; char argv_r_[PADR_(u_int32_t *)];
 	char envv_l_[PADL_(u_int32_t *)]; u_int32_t * envv; char envv_r_[PADR_(u_int32_t *)];
 };
-struct ia32_setitimer_args {
+struct freebsd32_setitimer_args {
 	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
 	char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)];
 	char oitv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * oitv; char oitv_r_[PADR_(struct itimerval32 *)];
 };
-struct ia32_select_args {
+struct freebsd32_select_args {
 	char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
 	char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)];
 	char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)];
 	char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)];
 	char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)];
 };
-struct ia32_gettimeofday_args {
+struct freebsd32_gettimeofday_args {
 	char tp_l_[PADL_(struct timeval32 *)]; struct timeval32 * tp; char tp_r_[PADR_(struct timeval32 *)];
 	char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)];
 };
-struct ia32_getrusage_args {
+struct freebsd32_getrusage_args {
 	char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
 	char rusage_l_[PADL_(struct rusage32 *)]; struct rusage32 * rusage; char rusage_r_[PADR_(struct rusage32 *)];
 };
-struct ia32_readv_args {
+struct freebsd32_readv_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
 	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
 };
-struct ia32_writev_args {
+struct freebsd32_writev_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
 	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
 };
-struct ia32_settimeofday_args {
+struct freebsd32_settimeofday_args {
 	char tv_l_[PADL_(struct timeval32 *)]; struct timeval32 * tv; char tv_r_[PADR_(struct timeval32 *)];
 	char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)];
 };
-struct ia32_utimes_args {
+struct freebsd32_utimes_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char tptr_r_[PADR_(struct timeval32 *)];
 };
-struct ia32_adjtime_args {
+struct freebsd32_adjtime_args {
 	char delta_l_[PADL_(struct timeval32 *)]; struct timeval32 * delta; char delta_r_[PADR_(struct timeval32 *)];
 	char olddelta_l_[PADL_(struct timeval32 *)]; struct timeval32 * olddelta; char olddelta_r_[PADR_(struct timeval32 *)];
 };
-struct ia32_statfs_args {
+struct freebsd32_statfs_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
 };
-struct ia32_fstatfs_args {
+struct freebsd32_fstatfs_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char buf_l_[PADL_(struct statfs32 *)]; struct statfs32 * buf; char buf_r_[PADR_(struct statfs32 *)];
 };
-struct ia32_semsys_args {
+struct freebsd32_semsys_args {
 	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
 	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
 	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
 	char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
 	char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
 };
-struct ia32_msgsys_args {
+struct freebsd32_msgsys_args {
 	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
 	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
 	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
@@ -130,13 +130,13 @@ struct ia32_msgsys_args {
 	char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
 	char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)];
 };
-struct ia32_shmsys_args {
+struct freebsd32_shmsys_args {
 	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
 	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
 	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
 	char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
 };
-struct ia32_pread_args {
+struct freebsd32_pread_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
 	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
@@ -144,7 +144,7 @@ struct ia32_pread_args {
 	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
 	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
 };
-struct ia32_pwrite_args {
+struct freebsd32_pwrite_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
 	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
@@ -152,19 +152,19 @@ struct ia32_pwrite_args {
 	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
 	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
 };
-struct ia32_stat_args {
+struct freebsd32_stat_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
 };
-struct ia32_fstat_args {
+struct freebsd32_fstat_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
 };
-struct ia32_lstat_args {
+struct freebsd32_lstat_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char ub_l_[PADL_(struct stat32 *)]; struct stat32 * ub; char ub_r_[PADR_(struct stat32 *)];
 };
-struct ia32_mmap_args {
+struct freebsd32_mmap_args {
 	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
 	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
 	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
@@ -174,26 +174,26 @@ struct ia32_mmap_args {
 	char poslo_l_[PADL_(u_int32_t)]; u_int32_t poslo; char poslo_r_[PADR_(u_int32_t)];
 	char poshi_l_[PADL_(u_int32_t)]; u_int32_t poshi; char poshi_r_[PADR_(u_int32_t)];
 };
-struct ia32_lseek_args {
+struct freebsd32_lseek_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
 	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
 	char offsethi_l_[PADL_(u_int32_t)]; u_int32_t offsethi; char offsethi_r_[PADR_(u_int32_t)];
 	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
 };
-struct ia32_truncate_args {
+struct freebsd32_truncate_args {
 	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
 	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
 	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
 	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
 };
-struct ia32_ftruncate_args {
+struct freebsd32_ftruncate_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
 	char lengthlo_l_[PADL_(u_int32_t)]; u_int32_t lengthlo; char lengthlo_r_[PADR_(u_int32_t)];
 	char lengthhi_l_[PADL_(u_int32_t)]; u_int32_t lengthhi; char lengthhi_r_[PADR_(u_int32_t)];
 };
-struct ia32_sysctl_args {
+struct freebsd32_sysctl_args {
 	char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
 	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
 	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
@@ -201,7 +201,7 @@ struct ia32_sysctl_args {
 	char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)];
 	char newlen_l_[PADL_(u_int32_t)]; u_int32_t newlen; char newlen_r_[PADR_(u_int32_t)];
 };
-struct ia32_kevent_args {
+struct freebsd32_kevent_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char changelist_l_[PADL_(const struct kevent *)]; const struct kevent * changelist; char changelist_r_[PADR_(const struct kevent *)];
 	char nchanges_l_[PADL_(int)]; int nchanges; char nchanges_r_[PADR_(int)];
@@ -209,7 +209,7 @@ struct ia32_kevent_args {
 	char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)];
 	char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
 };
-struct ia32_sendfile_args {
+struct freebsd32_sendfile_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
 	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
@@ -219,49 +219,49 @@ struct ia32_sendfile_args {
 	char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
-struct ia32_sigaction_args {
+struct freebsd32_sigaction_args {
 	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
 	char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)];
 	char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)];
 };
-struct ia32_sigreturn_args {
-	char sigcntxp_l_[PADL_(const struct ia32_ucontext *)]; const struct ia32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct ia32_ucontext *)];
-};
-int	ia32_open(struct thread *, struct ia32_open_args *);
-int	ia32_wait4(struct thread *, struct ia32_wait4_args *);
-int	ia32_getfsstat(struct thread *, struct ia32_getfsstat_args *);
-int	ia32_access(struct thread *, struct ia32_access_args *);
-int	ia32_chflags(struct thread *, struct ia32_chflags_args *);
-int	ia32_sigaltstack(struct thread *, struct ia32_sigaltstack_args *);
-int	ia32_execve(struct thread *, struct ia32_execve_args *);
-int	ia32_setitimer(struct thread *, struct ia32_setitimer_args *);
-int	ia32_select(struct thread *, struct ia32_select_args *);
-int	ia32_gettimeofday(struct thread *, struct ia32_gettimeofday_args *);
-int	ia32_getrusage(struct thread *, struct ia32_getrusage_args *);
-int	ia32_readv(struct thread *, struct ia32_readv_args *);
-int	ia32_writev(struct thread *, struct ia32_writev_args *);
-int	ia32_settimeofday(struct thread *, struct ia32_settimeofday_args *);
-int	ia32_utimes(struct thread *, struct ia32_utimes_args *);
-int	ia32_adjtime(struct thread *, struct ia32_adjtime_args *);
-int	ia32_statfs(struct thread *, struct ia32_statfs_args *);
-int	ia32_fstatfs(struct thread *, struct ia32_fstatfs_args *);
-int	ia32_semsys(struct thread *, struct ia32_semsys_args *);
-int	ia32_msgsys(struct thread *, struct ia32_msgsys_args *);
-int	ia32_shmsys(struct thread *, struct ia32_shmsys_args *);
-int	ia32_pread(struct thread *, struct ia32_pread_args *);
-int	ia32_pwrite(struct thread *, struct ia32_pwrite_args *);
-int	ia32_stat(struct thread *, struct ia32_stat_args *);
-int	ia32_fstat(struct thread *, struct ia32_fstat_args *);
-int	ia32_lstat(struct thread *, struct ia32_lstat_args *);
-int	ia32_mmap(struct thread *, struct ia32_mmap_args *);
-int	ia32_lseek(struct thread *, struct ia32_lseek_args *);
-int	ia32_truncate(struct thread *, struct ia32_truncate_args *);
-int	ia32_ftruncate(struct thread *, struct ia32_ftruncate_args *);
-int	ia32_sysctl(struct thread *, struct ia32_sysctl_args *);
-int	ia32_kevent(struct thread *, struct ia32_kevent_args *);
-int	ia32_sendfile(struct thread *, struct ia32_sendfile_args *);
-int	ia32_sigaction(struct thread *, struct ia32_sigaction_args *);
-int	ia32_sigreturn(struct thread *, struct ia32_sigreturn_args *);
+struct freebsd32_sigreturn_args {
+	char sigcntxp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd32_ucontext *)];
+};
+int	freebsd32_open(struct thread *, struct freebsd32_open_args *);
+int	freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *);
+int	freebsd32_getfsstat(struct thread *, struct freebsd32_getfsstat_args *);
+int	freebsd32_access(struct thread *, struct freebsd32_access_args *);
+int	freebsd32_chflags(struct thread *, struct freebsd32_chflags_args *);
+int	freebsd32_sigaltstack(struct thread *, struct freebsd32_sigaltstack_args *);
+int	freebsd32_execve(struct thread *, struct freebsd32_execve_args *);
+int	freebsd32_setitimer(struct thread *, struct freebsd32_setitimer_args *);
+int	freebsd32_select(struct thread *, struct freebsd32_select_args *);
+int	freebsd32_gettimeofday(struct thread *, struct freebsd32_gettimeofday_args *);
+int	freebsd32_getrusage(struct thread *, struct freebsd32_getrusage_args *);
+int	freebsd32_readv(struct thread *, struct freebsd32_readv_args *);
+int	freebsd32_writev(struct thread *, struct freebsd32_writev_args *);
+int	freebsd32_settimeofday(struct thread *, struct freebsd32_settimeofday_args *);
+int	freebsd32_utimes(struct thread *, struct freebsd32_utimes_args *);
+int	freebsd32_adjtime(struct thread *, struct freebsd32_adjtime_args *);
+int	freebsd32_statfs(struct thread *, struct freebsd32_statfs_args *);
+int	freebsd32_fstatfs(struct thread *, struct freebsd32_fstatfs_args *);
+int	freebsd32_semsys(struct thread *, struct freebsd32_semsys_args *);
+int	freebsd32_msgsys(struct thread *, struct freebsd32_msgsys_args *);
+int	freebsd32_shmsys(struct thread *, struct freebsd32_shmsys_args *);
+int	freebsd32_pread(struct thread *, struct freebsd32_pread_args *);
+int	freebsd32_pwrite(struct thread *, struct freebsd32_pwrite_args *);
+int	freebsd32_stat(struct thread *, struct freebsd32_stat_args *);
+int	freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *);
+int	freebsd32_lstat(struct thread *, struct freebsd32_lstat_args *);
+int	freebsd32_mmap(struct thread *, struct freebsd32_mmap_args *);
+int	freebsd32_lseek(struct thread *, struct freebsd32_lseek_args *);
+int	freebsd32_truncate(struct thread *, struct freebsd32_truncate_args *);
+int	freebsd32_ftruncate(struct thread *, struct freebsd32_ftruncate_args *);
+int	freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
+int	freebsd32_kevent(struct thread *, struct freebsd32_kevent_args *);
+int	freebsd32_sendfile(struct thread *, struct freebsd32_sendfile_args *);
+int	freebsd32_sigaction(struct thread *, struct freebsd32_sigaction_args *);
+int	freebsd32_sigreturn(struct thread *, struct freebsd32_sigreturn_args *);
 
 #ifdef COMPAT_43
 
@@ -271,7 +271,7 @@ int	ia32_sigreturn(struct thread *, struct ia32_sigreturn_args *);
 
 #ifdef COMPAT_FREEBSD4
 
-struct freebsd4_ia32_sendfile_args {
+struct freebsd4_freebsd32_sendfile_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
 	char offsetlo_l_[PADL_(u_int32_t)]; u_int32_t offsetlo; char offsetlo_r_[PADR_(u_int32_t)];
@@ -281,17 +281,17 @@ struct freebsd4_ia32_sendfile_args {
 	char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
 	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
 };
-struct freebsd4_ia32_sigaction_args {
+struct freebsd4_freebsd32_sigaction_args {
 	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
 	char act_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * act; char act_r_[PADR_(struct sigaction32 *)];
 	char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)];
 };
-struct freebsd4_ia32_sigreturn_args {
+struct freebsd4_freebsd32_sigreturn_args {
 	char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)];
 };
-int	freebsd4_ia32_sendfile(struct thread *, struct freebsd4_ia32_sendfile_args *);
-int	freebsd4_ia32_sigaction(struct thread *, struct freebsd4_ia32_sigaction_args *);
-int	freebsd4_ia32_sigreturn(struct thread *, struct freebsd4_ia32_sigreturn_args *);
+int	freebsd4_freebsd32_sendfile(struct thread *, struct freebsd4_freebsd32_sendfile_args *);
+int	freebsd4_freebsd32_sigaction(struct thread *, struct freebsd4_freebsd32_sigaction_args *);
+int	freebsd4_freebsd32_sigreturn(struct thread *, struct freebsd4_freebsd32_sigreturn_args *);
 
 #endif /* COMPAT_FREEBSD4 */
 
@@ -299,4 +299,4 @@ int	freebsd4_ia32_sigreturn(struct thread *, struct freebsd4_ia32_sigreturn_args
 #undef PADL_
 #undef PADR_
 
-#endif /* !_IA32_SYSPROTO_H_ */
+#endif /* !_FREEBSD32_SYSPROTO_H_ */
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h b/sys/compat/freebsd32/freebsd32_syscall.h
index 6920635..a08618d 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -3,66 +3,66 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.23 2003/08/21 03:48:05 peter Exp 
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.24 2003/08/22 22:51:48 peter Exp 
  */
 
-#define	IA32_SYS_syscall	0
-#define	IA32_SYS_exit	1
-#define	IA32_SYS_fork	2
-#define	IA32_SYS_read	3
-#define	IA32_SYS_write	4
-#define	IA32_SYS_ia32_open	5
-#define	IA32_SYS_close	6
-#define	IA32_SYS_ia32_wait4	7
+#define	FREEBSD32_SYS_syscall	0
+#define	FREEBSD32_SYS_exit	1
+#define	FREEBSD32_SYS_fork	2
+#define	FREEBSD32_SYS_read	3
+#define	FREEBSD32_SYS_write	4
+#define	FREEBSD32_SYS_freebsd32_open	5
+#define	FREEBSD32_SYS_close	6
+#define	FREEBSD32_SYS_freebsd32_wait4	7
 				/* 8 is obsolete old creat */
-#define	IA32_SYS_link	9
-#define	IA32_SYS_unlink	10
+#define	FREEBSD32_SYS_link	9
+#define	FREEBSD32_SYS_unlink	10
 				/* 11 is obsolete execv */
-#define	IA32_SYS_chdir	12
-#define	IA32_SYS_fchdir	13
-#define	IA32_SYS_mknod	14
-#define	IA32_SYS_chmod	15
-#define	IA32_SYS_chown	16
-#define	IA32_SYS_break	17
-#define	IA32_SYS_ia32_getfsstat	18
+#define	FREEBSD32_SYS_chdir	12
+#define	FREEBSD32_SYS_fchdir	13
+#define	FREEBSD32_SYS_mknod	14
+#define	FREEBSD32_SYS_chmod	15
+#define	FREEBSD32_SYS_chown	16
+#define	FREEBSD32_SYS_break	17
+#define	FREEBSD32_SYS_freebsd32_getfsstat	18
 				/* 19 is obsolete olseek */
-#define	IA32_SYS_getpid	20
-#define	IA32_SYS_mount	21
-#define	IA32_SYS_unmount	22
-#define	IA32_SYS_setuid	23
-#define	IA32_SYS_getuid	24
-#define	IA32_SYS_geteuid	25
-#define	IA32_SYS_ptrace	26
-#define	IA32_SYS_sendmsg	28
-#define	IA32_SYS_recvfrom	29
-#define	IA32_SYS_accept	30
-#define	IA32_SYS_getpeername	31
-#define	IA32_SYS_getsockname	32
-#define	IA32_SYS_ia32_access	33
-#define	IA32_SYS_ia32_chflags	34
-#define	IA32_SYS_fchflags	35
-#define	IA32_SYS_sync	36
-#define	IA32_SYS_kill	37
-#define	IA32_SYS_getppid	39
-#define	IA32_SYS_dup	41
-#define	IA32_SYS_pipe	42
-#define	IA32_SYS_getegid	43
-#define	IA32_SYS_profil	44
-#define	IA32_SYS_ktrace	45
-#define	IA32_SYS_getgid	47
-#define	IA32_SYS_getlogin	49
-#define	IA32_SYS_setlogin	50
-#define	IA32_SYS_acct	51
-#define	IA32_SYS_sigpending	52
-#define	IA32_SYS_ia32_sigaltstack	53
-#define	IA32_SYS_ioctl	54
-#define	IA32_SYS_reboot	55
-#define	IA32_SYS_revoke	56
-#define	IA32_SYS_symlink	57
-#define	IA32_SYS_readlink	58
-#define	IA32_SYS_ia32_execve	59
-#define	IA32_SYS_umask	60
-#define	IA32_SYS_chroot	61
+#define	FREEBSD32_SYS_getpid	20
+#define	FREEBSD32_SYS_mount	21
+#define	FREEBSD32_SYS_unmount	22
+#define	FREEBSD32_SYS_setuid	23
+#define	FREEBSD32_SYS_getuid	24
+#define	FREEBSD32_SYS_geteuid	25
+#define	FREEBSD32_SYS_ptrace	26
+#define	FREEBSD32_SYS_sendmsg	28
+#define	FREEBSD32_SYS_recvfrom	29
+#define	FREEBSD32_SYS_accept	30
+#define	FREEBSD32_SYS_getpeername	31
+#define	FREEBSD32_SYS_getsockname	32
+#define	FREEBSD32_SYS_freebsd32_access	33
+#define	FREEBSD32_SYS_freebsd32_chflags	34
+#define	FREEBSD32_SYS_fchflags	35
+#define	FREEBSD32_SYS_sync	36
+#define	FREEBSD32_SYS_kill	37
+#define	FREEBSD32_SYS_getppid	39
+#define	FREEBSD32_SYS_dup	41
+#define	FREEBSD32_SYS_pipe	42
+#define	FREEBSD32_SYS_getegid	43
+#define	FREEBSD32_SYS_profil	44
+#define	FREEBSD32_SYS_ktrace	45
+#define	FREEBSD32_SYS_getgid	47
+#define	FREEBSD32_SYS_getlogin	49
+#define	FREEBSD32_SYS_setlogin	50
+#define	FREEBSD32_SYS_acct	51
+#define	FREEBSD32_SYS_sigpending	52
+#define	FREEBSD32_SYS_freebsd32_sigaltstack	53
+#define	FREEBSD32_SYS_ioctl	54
+#define	FREEBSD32_SYS_reboot	55
+#define	FREEBSD32_SYS_revoke	56
+#define	FREEBSD32_SYS_symlink	57
+#define	FREEBSD32_SYS_readlink	58
+#define	FREEBSD32_SYS_freebsd32_execve	59
+#define	FREEBSD32_SYS_umask	60
+#define	FREEBSD32_SYS_chroot	61
 				/* 62 is obsolete ofstat */
 				/* 63 is obsolete ogetkerninfo */
 				/* 64 is obsolete ogetpagesize */
@@ -70,42 +70,42 @@
 				/* 66 is obsolete ovfork */
 				/* 67 is obsolete vread */
 				/* 68 is obsolete vwrite */
-#define	IA32_SYS_sbrk	69
-#define	IA32_SYS_sstk	70
+#define	FREEBSD32_SYS_sbrk	69
+#define	FREEBSD32_SYS_sstk	70
 				/* 71 is obsolete ommap */
-#define	IA32_SYS_vadvise	72
-#define	IA32_SYS_munmap	73
-#define	IA32_SYS_mprotect	74
-#define	IA32_SYS_madvise	75
+#define	FREEBSD32_SYS_vadvise	72
+#define	FREEBSD32_SYS_munmap	73
+#define	FREEBSD32_SYS_mprotect	74
+#define	FREEBSD32_SYS_madvise	75
 				/* 76 is obsolete vhangup */
 				/* 77 is obsolete vlimit */
-#define	IA32_SYS_mincore	78
-#define	IA32_SYS_getgroups	79
-#define	IA32_SYS_setgroups	80
-#define	IA32_SYS_getpgrp	81
-#define	IA32_SYS_setpgid	82
-#define	IA32_SYS_ia32_setitimer	83
+#define	FREEBSD32_SYS_mincore	78
+#define	FREEBSD32_SYS_getgroups	79
+#define	FREEBSD32_SYS_setgroups	80
+#define	FREEBSD32_SYS_getpgrp	81
+#define	FREEBSD32_SYS_setpgid	82
+#define	FREEBSD32_SYS_freebsd32_setitimer	83
 				/* 84 is obsolete owait */
 				/* 85 is obsolete oswapon */
 				/* 86 is obsolete ogetitimer */
 				/* 87 is obsolete ogethostname */
 				/* 88 is obsolete osethostname */
-#define	IA32_SYS_getdtablesize	89
-#define	IA32_SYS_dup2	90
-#define	IA32_SYS_fcntl	92
-#define	IA32_SYS_ia32_select	93
-#define	IA32_SYS_fsync	95
-#define	IA32_SYS_setpriority	96
-#define	IA32_SYS_socket	97
-#define	IA32_SYS_connect	98
-#define	IA32_SYS_accept	99
-#define	IA32_SYS_getpriority	100
+#define	FREEBSD32_SYS_getdtablesize	89
+#define	FREEBSD32_SYS_dup2	90
+#define	FREEBSD32_SYS_fcntl	92
+#define	FREEBSD32_SYS_freebsd32_select	93
+#define	FREEBSD32_SYS_fsync	95
+#define	FREEBSD32_SYS_setpriority	96
+#define	FREEBSD32_SYS_socket	97
+#define	FREEBSD32_SYS_connect	98
+#define	FREEBSD32_SYS_accept	99
+#define	FREEBSD32_SYS_getpriority	100
 				/* 101 is obsolete osend */
 				/* 102 is obsolete orecv */
 				/* 103 is obsolete osigreturn */
-#define	IA32_SYS_bind	104
-#define	IA32_SYS_setsockopt	105
-#define	IA32_SYS_listen	106
+#define	FREEBSD32_SYS_bind	104
+#define	FREEBSD32_SYS_setsockopt	105
+#define	FREEBSD32_SYS_listen	106
 				/* 107 is obsolete vtimes */
 				/* 108 is obsolete osigvec */
 				/* 109 is obsolete osigblock */
@@ -115,184 +115,184 @@
 				/* 113 is obsolete orecvmsg */
 				/* 114 is obsolete osendmsg */
 				/* 115 is obsolete vtrace */
-#define	IA32_SYS_ia32_gettimeofday	116
-#define	IA32_SYS_ia32_getrusage	117
-#define	IA32_SYS_getsockopt	118
-#define	IA32_SYS_ia32_readv	120
-#define	IA32_SYS_ia32_writev	121
-#define	IA32_SYS_ia32_settimeofday	122
-#define	IA32_SYS_fchown	123
-#define	IA32_SYS_fchmod	124
-#define	IA32_SYS_recvfrom	125
-#define	IA32_SYS_setreuid	126
-#define	IA32_SYS_setregid	127
-#define	IA32_SYS_rename	128
+#define	FREEBSD32_SYS_freebsd32_gettimeofday	116
+#define	FREEBSD32_SYS_freebsd32_getrusage	117
+#define	FREEBSD32_SYS_getsockopt	118
+#define	FREEBSD32_SYS_freebsd32_readv	120
+#define	FREEBSD32_SYS_freebsd32_writev	121
+#define	FREEBSD32_SYS_freebsd32_settimeofday	122
+#define	FREEBSD32_SYS_fchown	123
+#define	FREEBSD32_SYS_fchmod	124
+#define	FREEBSD32_SYS_recvfrom	125
+#define	FREEBSD32_SYS_setreuid	126
+#define	FREEBSD32_SYS_setregid	127
+#define	FREEBSD32_SYS_rename	128
 				/* 129 is obsolete otruncate */
 				/* 130 is obsolete ftruncate */
-#define	IA32_SYS_flock	131
-#define	IA32_SYS_mkfifo	132
-#define	IA32_SYS_sendto	133
-#define	IA32_SYS_shutdown	134
-#define	IA32_SYS_socketpair	135
-#define	IA32_SYS_mkdir	136
-#define	IA32_SYS_rmdir	137
-#define	IA32_SYS_ia32_utimes	138
+#define	FREEBSD32_SYS_flock	131
+#define	FREEBSD32_SYS_mkfifo	132
+#define	FREEBSD32_SYS_sendto	133
+#define	FREEBSD32_SYS_shutdown	134
+#define	FREEBSD32_SYS_socketpair	135
+#define	FREEBSD32_SYS_mkdir	136
+#define	FREEBSD32_SYS_rmdir	137
+#define	FREEBSD32_SYS_freebsd32_utimes	138
 				/* 139 is obsolete 4.2 sigreturn */
-#define	IA32_SYS_ia32_adjtime	140
+#define	FREEBSD32_SYS_freebsd32_adjtime	140
 				/* 141 is obsolete ogetpeername */
 				/* 142 is obsolete ogethostid */
 				/* 143 is obsolete sethostid */
 				/* 144 is obsolete getrlimit */
 				/* 145 is obsolete setrlimit */
 				/* 146 is obsolete killpg */
-#define	IA32_SYS_setsid	147
-#define	IA32_SYS_quotactl	148
+#define	FREEBSD32_SYS_setsid	147
+#define	FREEBSD32_SYS_quotactl	148
 				/* 149 is obsolete oquota */
 				/* 150 is obsolete ogetsockname */
-#define	IA32_SYS_getdirentries	156
-#define	IA32_SYS_ia32_statfs	157
-#define	IA32_SYS_ia32_fstatfs	158
-#define	IA32_SYS_getfh	161
-#define	IA32_SYS_getdomainname	162
-#define	IA32_SYS_setdomainname	163
-#define	IA32_SYS_uname	164
-#define	IA32_SYS_sysarch	165
-#define	IA32_SYS_rtprio	166
-#define	IA32_SYS_ia32_semsys	169
-#define	IA32_SYS_ia32_msgsys	170
-#define	IA32_SYS_ia32_shmsys	171
-#define	IA32_SYS_ia32_pread	173
-#define	IA32_SYS_ia32_pwrite	174
-#define	IA32_SYS_ntp_adjtime	176
-#define	IA32_SYS_setgid	181
-#define	IA32_SYS_setegid	182
-#define	IA32_SYS_seteuid	183
-#define	IA32_SYS_ia32_stat	188
-#define	IA32_SYS_ia32_fstat	189
-#define	IA32_SYS_ia32_lstat	190
-#define	IA32_SYS_pathconf	191
-#define	IA32_SYS_fpathconf	192
-#define	IA32_SYS_getrlimit	194
-#define	IA32_SYS_setrlimit	195
-#define	IA32_SYS_getdirentries	196
-#define	IA32_SYS_ia32_mmap	197
-#define	IA32_SYS___syscall	198
-#define	IA32_SYS_ia32_lseek	199
-#define	IA32_SYS_ia32_truncate	200
-#define	IA32_SYS_ia32_ftruncate	201
-#define	IA32_SYS_ia32_sysctl	202
-#define	IA32_SYS_mlock	203
-#define	IA32_SYS_munlock	204
-#define	IA32_SYS_undelete	205
-#define	IA32_SYS_futimes	206
-#define	IA32_SYS_getpgid	207
-#define	IA32_SYS_poll	209
-#define	IA32_SYS___semctl	220
-#define	IA32_SYS_semget	221
-#define	IA32_SYS_semop	222
-#define	IA32_SYS_msgctl	224
-#define	IA32_SYS_msgget	225
-#define	IA32_SYS_msgsnd	226
-#define	IA32_SYS_msgrcv	227
-#define	IA32_SYS_shmat	228
-#define	IA32_SYS_shmctl	229
-#define	IA32_SYS_shmdt	230
-#define	IA32_SYS_shmget	231
-#define	IA32_SYS_clock_gettime	232
-#define	IA32_SYS_clock_settime	233
-#define	IA32_SYS_clock_getres	234
-#define	IA32_SYS_nanosleep	240
-#define	IA32_SYS_minherit	250
-#define	IA32_SYS_rfork	251
-#define	IA32_SYS_openbsd_poll	252
-#define	IA32_SYS_issetugid	253
-#define	IA32_SYS_lchown	254
-#define	IA32_SYS_getdents	272
-#define	IA32_SYS_lchmod	274
-#define	IA32_SYS_netbsd_lchown	275
-#define	IA32_SYS_lutimes	276
-#define	IA32_SYS_netbsd_msync	277
-#define	IA32_SYS_nstat	278
-#define	IA32_SYS_nfstat	279
-#define	IA32_SYS_nlstat	280
-#define	IA32_SYS_fhstatfs	297
-#define	IA32_SYS_fhopen	298
-#define	IA32_SYS_fhstat	299
-#define	IA32_SYS_modnext	300
-#define	IA32_SYS_modstat	301
-#define	IA32_SYS_modfnext	302
-#define	IA32_SYS_modfind	303
-#define	IA32_SYS_kldload	304
-#define	IA32_SYS_kldunload	305
-#define	IA32_SYS_kldfind	306
-#define	IA32_SYS_kldnext	307
-#define	IA32_SYS_kldstat	308
-#define	IA32_SYS_kldfirstmod	309
-#define	IA32_SYS_getsid	310
-#define	IA32_SYS_setresuid	311
-#define	IA32_SYS_setresgid	312
+#define	FREEBSD32_SYS_getdirentries	156
+#define	FREEBSD32_SYS_freebsd32_statfs	157
+#define	FREEBSD32_SYS_freebsd32_fstatfs	158
+#define	FREEBSD32_SYS_getfh	161
+#define	FREEBSD32_SYS_getdomainname	162
+#define	FREEBSD32_SYS_setdomainname	163
+#define	FREEBSD32_SYS_uname	164
+#define	FREEBSD32_SYS_sysarch	165
+#define	FREEBSD32_SYS_rtprio	166
+#define	FREEBSD32_SYS_freebsd32_semsys	169
+#define	FREEBSD32_SYS_freebsd32_msgsys	170
+#define	FREEBSD32_SYS_freebsd32_shmsys	171
+#define	FREEBSD32_SYS_freebsd32_pread	173
+#define	FREEBSD32_SYS_freebsd32_pwrite	174
+#define	FREEBSD32_SYS_ntp_adjtime	176
+#define	FREEBSD32_SYS_setgid	181
+#define	FREEBSD32_SYS_setegid	182
+#define	FREEBSD32_SYS_seteuid	183
+#define	FREEBSD32_SYS_freebsd32_stat	188
+#define	FREEBSD32_SYS_freebsd32_fstat	189
+#define	FREEBSD32_SYS_freebsd32_lstat	190
+#define	FREEBSD32_SYS_pathconf	191
+#define	FREEBSD32_SYS_fpathconf	192
+#define	FREEBSD32_SYS_getrlimit	194
+#define	FREEBSD32_SYS_setrlimit	195
+#define	FREEBSD32_SYS_getdirentries	196
+#define	FREEBSD32_SYS_freebsd32_mmap	197
+#define	FREEBSD32_SYS___syscall	198
+#define	FREEBSD32_SYS_freebsd32_lseek	199
+#define	FREEBSD32_SYS_freebsd32_truncate	200
+#define	FREEBSD32_SYS_freebsd32_ftruncate	201
+#define	FREEBSD32_SYS_freebsd32_sysctl	202
+#define	FREEBSD32_SYS_mlock	203
+#define	FREEBSD32_SYS_munlock	204
+#define	FREEBSD32_SYS_undelete	205
+#define	FREEBSD32_SYS_futimes	206
+#define	FREEBSD32_SYS_getpgid	207
+#define	FREEBSD32_SYS_poll	209
+#define	FREEBSD32_SYS___semctl	220
+#define	FREEBSD32_SYS_semget	221
+#define	FREEBSD32_SYS_semop	222
+#define	FREEBSD32_SYS_msgctl	224
+#define	FREEBSD32_SYS_msgget	225
+#define	FREEBSD32_SYS_msgsnd	226
+#define	FREEBSD32_SYS_msgrcv	227
+#define	FREEBSD32_SYS_shmat	228
+#define	FREEBSD32_SYS_shmctl	229
+#define	FREEBSD32_SYS_shmdt	230
+#define	FREEBSD32_SYS_shmget	231
+#define	FREEBSD32_SYS_clock_gettime	232
+#define	FREEBSD32_SYS_clock_settime	233
+#define	FREEBSD32_SYS_clock_getres	234
+#define	FREEBSD32_SYS_nanosleep	240
+#define	FREEBSD32_SYS_minherit	250
+#define	FREEBSD32_SYS_rfork	251
+#define	FREEBSD32_SYS_openbsd_poll	252
+#define	FREEBSD32_SYS_issetugid	253
+#define	FREEBSD32_SYS_lchown	254
+#define	FREEBSD32_SYS_getdents	272
+#define	FREEBSD32_SYS_lchmod	274
+#define	FREEBSD32_SYS_netbsd_lchown	275
+#define	FREEBSD32_SYS_lutimes	276
+#define	FREEBSD32_SYS_netbsd_msync	277
+#define	FREEBSD32_SYS_nstat	278
+#define	FREEBSD32_SYS_nfstat	279
+#define	FREEBSD32_SYS_nlstat	280
+#define	FREEBSD32_SYS_fhstatfs	297
+#define	FREEBSD32_SYS_fhopen	298
+#define	FREEBSD32_SYS_fhstat	299
+#define	FREEBSD32_SYS_modnext	300
+#define	FREEBSD32_SYS_modstat	301
+#define	FREEBSD32_SYS_modfnext	302
+#define	FREEBSD32_SYS_modfind	303
+#define	FREEBSD32_SYS_kldload	304
+#define	FREEBSD32_SYS_kldunload	305
+#define	FREEBSD32_SYS_kldfind	306
+#define	FREEBSD32_SYS_kldnext	307
+#define	FREEBSD32_SYS_kldstat	308
+#define	FREEBSD32_SYS_kldfirstmod	309
+#define	FREEBSD32_SYS_getsid	310
+#define	FREEBSD32_SYS_setresuid	311
+#define	FREEBSD32_SYS_setresgid	312
 				/* 313 is obsolete signanosleep */
-#define	IA32_SYS_yield	321
+#define	FREEBSD32_SYS_yield	321
 				/* 322 is obsolete thr_sleep */
 				/* 323 is obsolete thr_wakeup */
-#define	IA32_SYS_mlockall	324
-#define	IA32_SYS_munlockall	325
-#define	IA32_SYS___getcwd	326
-#define	IA32_SYS_sched_setparam	327
-#define	IA32_SYS_sched_getparam	328
-#define	IA32_SYS_sched_setscheduler	329
-#define	IA32_SYS_sched_getscheduler	330
-#define	IA32_SYS_sched_yield	331
-#define	IA32_SYS_sched_get_priority_max	332
-#define	IA32_SYS_sched_get_priority_min	333
-#define	IA32_SYS_sched_rr_get_interval	334
-#define	IA32_SYS_utrace	335
-				/* 336 is old ia32_sendfile */
-#define	IA32_SYS_kldsym	337
-#define	IA32_SYS_jail	338
-#define	IA32_SYS_sigprocmask	340
-#define	IA32_SYS_sigsuspend	341
-				/* 342 is old ia32_sigaction */
-#define	IA32_SYS_sigpending	343
-				/* 344 is old ia32_sigreturn */
-#define	IA32_SYS___acl_get_file	347
-#define	IA32_SYS___acl_set_file	348
-#define	IA32_SYS___acl_get_fd	349
-#define	IA32_SYS___acl_set_fd	350
-#define	IA32_SYS___acl_delete_file	351
-#define	IA32_SYS___acl_delete_fd	352
-#define	IA32_SYS___acl_aclcheck_file	353
-#define	IA32_SYS___acl_aclcheck_fd	354
-#define	IA32_SYS_extattrctl	355
-#define	IA32_SYS_extattr_set_file	356
-#define	IA32_SYS_extattr_get_file	357
-#define	IA32_SYS_extattr_delete_file	358
-#define	IA32_SYS_getresuid	360
-#define	IA32_SYS_getresgid	361
-#define	IA32_SYS_kqueue	362
-#define	IA32_SYS_ia32_kevent	363
-#define	IA32_SYS_extattr_set_fd	371
-#define	IA32_SYS_extattr_get_fd	372
-#define	IA32_SYS_extattr_delete_fd	373
-#define	IA32_SYS___setugid	374
-#define	IA32_SYS_eaccess	376
-#define	IA32_SYS_nmount	378
-#define	IA32_SYS_kse_exit	379
-#define	IA32_SYS_kse_wakeup	380
-#define	IA32_SYS_kse_create	381
-#define	IA32_SYS_kse_thr_interrupt	382
-#define	IA32_SYS_kse_release	383
-#define	IA32_SYS_kenv	390
-#define	IA32_SYS_lchflags	391
-#define	IA32_SYS_uuidgen	392
-#define	IA32_SYS_ia32_sendfile	393
-#define	IA32_SYS_ia32_sigaction	416
-#define	IA32_SYS_ia32_sigreturn	417
-#define	IA32_SYS_thr_create	430
-#define	IA32_SYS_thr_exit	431
-#define	IA32_SYS_thr_self	432
-#define	IA32_SYS_thr_kill	433
-#define	IA32_SYS__umtx_lock	434
-#define	IA32_SYS__umtx_unlock	435
-#define	IA32_SYS_jail_attach	436
-#define	IA32_SYS_MAXSYSCALL	437
+#define	FREEBSD32_SYS_mlockall	324
+#define	FREEBSD32_SYS_munlockall	325
+#define	FREEBSD32_SYS___getcwd	326
+#define	FREEBSD32_SYS_sched_setparam	327
+#define	FREEBSD32_SYS_sched_getparam	328
+#define	FREEBSD32_SYS_sched_setscheduler	329
+#define	FREEBSD32_SYS_sched_getscheduler	330
+#define	FREEBSD32_SYS_sched_yield	331
+#define	FREEBSD32_SYS_sched_get_priority_max	332
+#define	FREEBSD32_SYS_sched_get_priority_min	333
+#define	FREEBSD32_SYS_sched_rr_get_interval	334
+#define	FREEBSD32_SYS_utrace	335
+				/* 336 is old freebsd32_sendfile */
+#define	FREEBSD32_SYS_kldsym	337
+#define	FREEBSD32_SYS_jail	338
+#define	FREEBSD32_SYS_sigprocmask	340
+#define	FREEBSD32_SYS_sigsuspend	341
+				/* 342 is old freebsd32_sigaction */
+#define	FREEBSD32_SYS_sigpending	343
+				/* 344 is old freebsd32_sigreturn */
+#define	FREEBSD32_SYS___acl_get_file	347
+#define	FREEBSD32_SYS___acl_set_file	348
+#define	FREEBSD32_SYS___acl_get_fd	349
+#define	FREEBSD32_SYS___acl_set_fd	350
+#define	FREEBSD32_SYS___acl_delete_file	351
+#define	FREEBSD32_SYS___acl_delete_fd	352
+#define	FREEBSD32_SYS___acl_aclcheck_file	353
+#define	FREEBSD32_SYS___acl_aclcheck_fd	354
+#define	FREEBSD32_SYS_extattrctl	355
+#define	FREEBSD32_SYS_extattr_set_file	356
+#define	FREEBSD32_SYS_extattr_get_file	357
+#define	FREEBSD32_SYS_extattr_delete_file	358
+#define	FREEBSD32_SYS_getresuid	360
+#define	FREEBSD32_SYS_getresgid	361
+#define	FREEBSD32_SYS_kqueue	362
+#define	FREEBSD32_SYS_freebsd32_kevent	363
+#define	FREEBSD32_SYS_extattr_set_fd	371
+#define	FREEBSD32_SYS_extattr_get_fd	372
+#define	FREEBSD32_SYS_extattr_delete_fd	373
+#define	FREEBSD32_SYS___setugid	374
+#define	FREEBSD32_SYS_eaccess	376
+#define	FREEBSD32_SYS_nmount	378
+#define	FREEBSD32_SYS_kse_exit	379
+#define	FREEBSD32_SYS_kse_wakeup	380
+#define	FREEBSD32_SYS_kse_create	381
+#define	FREEBSD32_SYS_kse_thr_interrupt	382
+#define	FREEBSD32_SYS_kse_release	383
+#define	FREEBSD32_SYS_kenv	390
+#define	FREEBSD32_SYS_lchflags	391
+#define	FREEBSD32_SYS_uuidgen	392
+#define	FREEBSD32_SYS_freebsd32_sendfile	393
+#define	FREEBSD32_SYS_freebsd32_sigaction	416
+#define	FREEBSD32_SYS_freebsd32_sigreturn	417
+#define	FREEBSD32_SYS_thr_create	430
+#define	FREEBSD32_SYS_thr_exit	431
+#define	FREEBSD32_SYS_thr_self	432
+#define	FREEBSD32_SYS_thr_kill	433
+#define	FREEBSD32_SYS__umtx_lock	434
+#define	FREEBSD32_SYS__umtx_unlock	435
+#define	FREEBSD32_SYS_jail_attach	436
+#define	FREEBSD32_SYS_MAXSYSCALL	437
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c b/sys/compat/freebsd32/freebsd32_syscalls.c
index 3b399f9..4b3b2dd 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -3,18 +3,18 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.23 2003/08/21 03:48:05 peter Exp 
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.24 2003/08/22 22:51:48 peter Exp 
  */
 
-const char *ia32_syscallnames[] = {
+const char *freebsd32_syscallnames[] = {
 	"syscall",			/* 0 = syscall */
 	"exit",			/* 1 = exit */
 	"fork",			/* 2 = fork */
 	"read",			/* 3 = read */
 	"write",			/* 4 = write */
-	"ia32_open",			/* 5 = ia32_open */
+	"freebsd32_open",			/* 5 = freebsd32_open */
 	"close",			/* 6 = close */
-	"ia32_wait4",			/* 7 = ia32_wait4 */
+	"freebsd32_wait4",			/* 7 = freebsd32_wait4 */
 	"obs_old",			/* 8 = obsolete old creat */
 	"link",			/* 9 = link */
 	"unlink",			/* 10 = unlink */
@@ -25,7 +25,7 @@ const char *ia32_syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"ia32_getfsstat",			/* 18 = ia32_getfsstat */
+	"freebsd32_getfsstat",			/* 18 = freebsd32_getfsstat */
 	"obs_olseek",			/* 19 = obsolete olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -40,8 +40,8 @@ const char *ia32_syscallnames[] = {
 	"accept",			/* 30 = accept */
 	"getpeername",			/* 31 = getpeername */
 	"getsockname",			/* 32 = getsockname */
-	"ia32_access",			/* 33 = ia32_access */
-	"ia32_chflags",			/* 34 = ia32_chflags */
+	"freebsd32_access",			/* 33 = freebsd32_access */
+	"freebsd32_chflags",			/* 34 = freebsd32_chflags */
 	"fchflags",			/* 35 = fchflags */
 	"sync",			/* 36 = sync */
 	"kill",			/* 37 = kill */
@@ -60,13 +60,13 @@ const char *ia32_syscallnames[] = {
 	"setlogin",			/* 50 = setlogin */
 	"acct",			/* 51 = acct */
 	"sigpending",			/* 52 = sigpending */
-	"ia32_sigaltstack",			/* 53 = ia32_sigaltstack */
+	"freebsd32_sigaltstack",			/* 53 = freebsd32_sigaltstack */
 	"ioctl",			/* 54 = ioctl */
 	"reboot",			/* 55 = reboot */
 	"revoke",			/* 56 = revoke */
 	"symlink",			/* 57 = symlink */
 	"readlink",			/* 58 = readlink */
-	"ia32_execve",			/* 59 = ia32_execve */
+	"freebsd32_execve",			/* 59 = freebsd32_execve */
 	"umask",			/* 60 = umask */
 	"chroot",			/* 61 = chroot */
 	"obs_ofstat",			/* 62 = obsolete ofstat */
@@ -90,7 +90,7 @@ const char *ia32_syscallnames[] = {
 	"setgroups",			/* 80 = setgroups */
 	"getpgrp",			/* 81 = getpgrp */
 	"setpgid",			/* 82 = setpgid */
-	"ia32_setitimer",			/* 83 = ia32_setitimer */
+	"freebsd32_setitimer",			/* 83 = freebsd32_setitimer */
 	"obs_owait",			/* 84 = obsolete owait */
 	"obs_oswapon",			/* 85 = obsolete oswapon */
 	"obs_ogetitimer",			/* 86 = obsolete ogetitimer */
@@ -100,7 +100,7 @@ const char *ia32_syscallnames[] = {
 	"dup2",			/* 90 = dup2 */
 	"#91",			/* 91 = getdopt */
 	"fcntl",			/* 92 = fcntl */
-	"ia32_select",			/* 93 = ia32_select */
+	"freebsd32_select",			/* 93 = freebsd32_select */
 	"#94",			/* 94 = setdopt */
 	"fsync",			/* 95 = fsync */
 	"setpriority",			/* 96 = setpriority */
@@ -123,13 +123,13 @@ const char *ia32_syscallnames[] = {
 	"obs_orecvmsg",			/* 113 = obsolete orecvmsg */
 	"obs_osendmsg",			/* 114 = obsolete osendmsg */
 	"obs_vtrace",			/* 115 = obsolete vtrace */
-	"ia32_gettimeofday",			/* 116 = ia32_gettimeofday */
-	"ia32_getrusage",			/* 117 = ia32_getrusage */
+	"freebsd32_gettimeofday",			/* 116 = freebsd32_gettimeofday */
+	"freebsd32_getrusage",			/* 117 = freebsd32_getrusage */
 	"getsockopt",			/* 118 = getsockopt */
 	"#119",			/* 119 = resuba */
-	"ia32_readv",			/* 120 = ia32_readv */
-	"ia32_writev",			/* 121 = ia32_writev */
-	"ia32_settimeofday",			/* 122 = ia32_settimeofday */
+	"freebsd32_readv",			/* 120 = freebsd32_readv */
+	"freebsd32_writev",			/* 121 = freebsd32_writev */
+	"freebsd32_settimeofday",			/* 122 = freebsd32_settimeofday */
 	"fchown",			/* 123 = fchown */
 	"fchmod",			/* 124 = fchmod */
 	"recvfrom",			/* 125 = recvfrom */
@@ -145,9 +145,9 @@ const char *ia32_syscallnames[] = {
 	"socketpair",			/* 135 = socketpair */
 	"mkdir",			/* 136 = mkdir */
 	"rmdir",			/* 137 = rmdir */
-	"ia32_utimes",			/* 138 = ia32_utimes */
+	"freebsd32_utimes",			/* 138 = freebsd32_utimes */
 	"obs_4.2",			/* 139 = obsolete 4.2 sigreturn */
-	"ia32_adjtime",			/* 140 = ia32_adjtime */
+	"freebsd32_adjtime",			/* 140 = freebsd32_adjtime */
 	"obs_ogetpeername",			/* 141 = obsolete ogetpeername */
 	"obs_ogethostid",			/* 142 = obsolete ogethostid */
 	"obs_sethostid",			/* 143 = obsolete sethostid */
@@ -164,8 +164,8 @@ const char *ia32_syscallnames[] = {
 	"#154",			/* 154 = nosys */
 	"#155",			/* 155 = nfssvc */
 	"getdirentries",			/* 156 = getdirentries */
-	"ia32_statfs",			/* 157 = ia32_statfs */
-	"ia32_fstatfs",			/* 158 = ia32_fstatfs */
+	"freebsd32_statfs",			/* 157 = freebsd32_statfs */
+	"freebsd32_fstatfs",			/* 158 = freebsd32_fstatfs */
 	"#159",			/* 159 = nosys */
 	"#160",			/* 160 = nosys */
 	"getfh",			/* 161 = getfh */
@@ -176,12 +176,12 @@ const char *ia32_syscallnames[] = {
 	"rtprio",			/* 166 = rtprio */
 	"#167",			/* 167 = nosys */
 	"#168",			/* 168 = nosys */
-	"ia32_semsys",			/* 169 = ia32_semsys */
-	"ia32_msgsys",			/* 170 = ia32_msgsys */
-	"ia32_shmsys",			/* 171 = ia32_shmsys */
+	"freebsd32_semsys",			/* 169 = freebsd32_semsys */
+	"freebsd32_msgsys",			/* 170 = freebsd32_msgsys */
+	"freebsd32_shmsys",			/* 171 = freebsd32_shmsys */
 	"#172",			/* 172 = nosys */
-	"ia32_pread",			/* 173 = ia32_pread */
-	"ia32_pwrite",			/* 174 = ia32_pwrite */
+	"freebsd32_pread",			/* 173 = freebsd32_pread */
+	"freebsd32_pwrite",			/* 174 = freebsd32_pwrite */
 	"#175",			/* 175 = nosys */
 	"ntp_adjtime",			/* 176 = ntp_adjtime */
 	"#177",			/* 177 = sfork */
@@ -195,21 +195,21 @@ const char *ia32_syscallnames[] = {
 	"#185",			/* 185 = lfs_markv */
 	"#186",			/* 186 = lfs_segclean */
 	"#187",			/* 187 = lfs_segwait */
-	"ia32_stat",			/* 188 = ia32_stat */
-	"ia32_fstat",			/* 189 = ia32_fstat */
-	"ia32_lstat",			/* 190 = ia32_lstat */
+	"freebsd32_stat",			/* 188 = freebsd32_stat */
+	"freebsd32_fstat",			/* 189 = freebsd32_fstat */
+	"freebsd32_lstat",			/* 190 = freebsd32_lstat */
 	"pathconf",			/* 191 = pathconf */
 	"fpathconf",			/* 192 = fpathconf */
 	"#193",			/* 193 = nosys */
 	"getrlimit",			/* 194 = getrlimit */
 	"setrlimit",			/* 195 = setrlimit */
 	"getdirentries",			/* 196 = getdirentries */
-	"ia32_mmap",			/* 197 = ia32_mmap */
+	"freebsd32_mmap",			/* 197 = freebsd32_mmap */
 	"__syscall",			/* 198 = __syscall */
-	"ia32_lseek",			/* 199 = ia32_lseek */
-	"ia32_truncate",			/* 200 = ia32_truncate */
-	"ia32_ftruncate",			/* 201 = ia32_ftruncate */
-	"ia32_sysctl",			/* 202 = ia32_sysctl */
+	"freebsd32_lseek",			/* 199 = freebsd32_lseek */
+	"freebsd32_truncate",			/* 200 = freebsd32_truncate */
+	"freebsd32_ftruncate",			/* 201 = freebsd32_ftruncate */
+	"freebsd32_sysctl",			/* 202 = freebsd32_sysctl */
 	"mlock",			/* 203 = mlock */
 	"munlock",			/* 204 = munlock */
 	"undelete",			/* 205 = undelete */
@@ -343,15 +343,15 @@ const char *ia32_syscallnames[] = {
 	"sched_get_priority_min",			/* 333 = sched_get_priority_min */
 	"sched_rr_get_interval",			/* 334 = sched_rr_get_interval */
 	"utrace",			/* 335 = utrace */
-	"old.ia32_sendfile",		/* 336 = old ia32_sendfile */
+	"old.freebsd32_sendfile",		/* 336 = old freebsd32_sendfile */
 	"kldsym",			/* 337 = kldsym */
 	"jail",			/* 338 = jail */
 	"#339",			/* 339 = pioctl */
 	"sigprocmask",			/* 340 = sigprocmask */
 	"sigsuspend",			/* 341 = sigsuspend */
-	"old.ia32_sigaction",		/* 342 = old ia32_sigaction */
+	"old.freebsd32_sigaction",		/* 342 = old freebsd32_sigaction */
 	"sigpending",			/* 343 = sigpending */
-	"old.ia32_sigreturn",		/* 344 = old ia32_sigreturn */
+	"old.freebsd32_sigreturn",		/* 344 = old freebsd32_sigreturn */
 	"#345",			/* 345 = sigtimedwait */
 	"#346",			/* 346 = sigwaitinfo */
 	"__acl_get_file",			/* 347 = __acl_get_file */
@@ -370,7 +370,7 @@ const char *ia32_syscallnames[] = {
 	"getresuid",			/* 360 = getresuid */
 	"getresgid",			/* 361 = getresgid */
 	"kqueue",			/* 362 = kqueue */
-	"ia32_kevent",			/* 363 = ia32_kevent */
+	"freebsd32_kevent",			/* 363 = freebsd32_kevent */
 	"#364",			/* 364 = __cap_get_proc */
 	"#365",			/* 365 = __cap_set_proc */
 	"#366",			/* 366 = __cap_get_fd */
@@ -400,7 +400,7 @@ const char *ia32_syscallnames[] = {
 	"kenv",			/* 390 = kenv */
 	"lchflags",			/* 391 = lchflags */
 	"uuidgen",			/* 392 = uuidgen */
-	"ia32_sendfile",			/* 393 = ia32_sendfile */
+	"freebsd32_sendfile",			/* 393 = freebsd32_sendfile */
 	"#394",			/* 394 = mac_syscall */
 	"#395",			/* 395 = nosys */
 	"#396",			/* 396 = nosys */
@@ -423,8 +423,8 @@ const char *ia32_syscallnames[] = {
 	"#413",			/* 413 = extattr_get_link */
 	"#414",			/* 414 = extattr_delete_link */
 	"#415",			/* 415 = __mac_execve */
-	"ia32_sigaction",			/* 416 = ia32_sigaction */
-	"ia32_sigreturn",			/* 417 = ia32_sigreturn */
+	"freebsd32_sigaction",			/* 416 = freebsd32_sigaction */
+	"freebsd32_sigreturn",			/* 417 = freebsd32_sigreturn */
 	"#418",			/* 418 = __xstat */
 	"#419",			/* 419 = __xfstat */
 	"#420",			/* 420 = __xlstat */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c b/sys/compat/freebsd32/freebsd32_sysent.c
index c39e4d9..e8761aa 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.23 2003/08/21 03:48:05 peter Exp 
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.24 2003/08/22 22:51:48 peter Exp 
  */
 
 #include "opt_compat.h"
@@ -12,8 +12,8 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 #include <sys/mount.h>
-#include <amd64/ia32/ia32.h>
-#include <amd64/ia32/ia32_proto.h>
+#include <compat/freebsd32/freebsd32.h>
+#include <compat/freebsd32/freebsd32_proto.h>
 
 #define AS(name) (sizeof(struct name) / sizeof(register_t))
 
@@ -24,15 +24,15 @@
 #endif
 
 /* The casts are bogus but will do for now. */
-struct sysent ia32_sysent[] = {
+struct sysent freebsd32_sysent[] = {
 	{ SYF_MPSAFE | 0, (sy_call_t *)nosys },		/* 0 = syscall */
 	{ SYF_MPSAFE | AS(sys_exit_args), (sy_call_t *)sys_exit },	/* 1 = exit */
 	{ SYF_MPSAFE | 0, (sy_call_t *)fork },		/* 2 = fork */
 	{ SYF_MPSAFE | AS(read_args), (sy_call_t *)read },	/* 3 = read */
 	{ SYF_MPSAFE | AS(write_args), (sy_call_t *)write },	/* 4 = write */
-	{ AS(ia32_open_args), (sy_call_t *)ia32_open },	/* 5 = ia32_open */
+	{ AS(freebsd32_open_args), (sy_call_t *)freebsd32_open },	/* 5 = freebsd32_open */
 	{ SYF_MPSAFE | AS(close_args), (sy_call_t *)close },	/* 6 = close */
-	{ SYF_MPSAFE | AS(ia32_wait4_args), (sy_call_t *)ia32_wait4 },	/* 7 = ia32_wait4 */
+	{ SYF_MPSAFE | AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4 },	/* 7 = freebsd32_wait4 */
 	{ 0, (sy_call_t *)nosys },			/* 8 = obsolete old creat */
 	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
 	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
@@ -43,7 +43,7 @@ struct sysent ia32_sysent[] = {
 	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
 	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
 	{ SYF_MPSAFE | AS(obreak_args), (sy_call_t *)obreak },	/* 17 = break */
-	{ AS(ia32_getfsstat_args), (sy_call_t *)ia32_getfsstat },	/* 18 = ia32_getfsstat */
+	{ AS(freebsd32_getfsstat_args), (sy_call_t *)freebsd32_getfsstat },	/* 18 = freebsd32_getfsstat */
 	{ 0, (sy_call_t *)nosys },			/* 19 = obsolete olseek */
 	{ SYF_MPSAFE | 0, (sy_call_t *)getpid },	/* 20 = getpid */
 	{ AS(mount_args), (sy_call_t *)mount },		/* 21 = mount */
@@ -58,8 +58,8 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(accept_args), (sy_call_t *)accept },	/* 30 = accept */
 	{ SYF_MPSAFE | AS(getpeername_args), (sy_call_t *)getpeername },	/* 31 = getpeername */
 	{ SYF_MPSAFE | AS(getsockname_args), (sy_call_t *)getsockname },	/* 32 = getsockname */
-	{ AS(ia32_access_args), (sy_call_t *)ia32_access },	/* 33 = ia32_access */
-	{ AS(ia32_chflags_args), (sy_call_t *)ia32_chflags },	/* 34 = ia32_chflags */
+	{ AS(freebsd32_access_args), (sy_call_t *)freebsd32_access },	/* 33 = freebsd32_access */
+	{ AS(freebsd32_chflags_args), (sy_call_t *)freebsd32_chflags },	/* 34 = freebsd32_chflags */
 	{ AS(fchflags_args), (sy_call_t *)fchflags },	/* 35 = fchflags */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
 	{ SYF_MPSAFE | AS(kill_args), (sy_call_t *)kill },	/* 37 = kill */
@@ -78,13 +78,13 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(setlogin_args), (sy_call_t *)setlogin },	/* 50 = setlogin */
 	{ SYF_MPSAFE | AS(acct_args), (sy_call_t *)acct },	/* 51 = acct */
 	{ SYF_MPSAFE | 0, (sy_call_t *)sigpending },	/* 52 = sigpending */
-	{ AS(ia32_sigaltstack_args), (sy_call_t *)ia32_sigaltstack },	/* 53 = ia32_sigaltstack */
+	{ AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack },	/* 53 = freebsd32_sigaltstack */
 	{ SYF_MPSAFE | AS(ioctl_args), (sy_call_t *)ioctl },	/* 54 = ioctl */
 	{ SYF_MPSAFE | AS(reboot_args), (sy_call_t *)reboot },	/* 55 = reboot */
 	{ AS(revoke_args), (sy_call_t *)revoke },	/* 56 = revoke */
 	{ AS(symlink_args), (sy_call_t *)symlink },	/* 57 = symlink */
 	{ AS(readlink_args), (sy_call_t *)readlink },	/* 58 = readlink */
-	{ AS(ia32_execve_args), (sy_call_t *)ia32_execve },	/* 59 = ia32_execve */
+	{ AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve },	/* 59 = freebsd32_execve */
 	{ SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask },	/* 60 = umask */
 	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
 	{ 0, (sy_call_t *)nosys },			/* 62 = obsolete ofstat */
@@ -108,7 +108,7 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(setgroups_args), (sy_call_t *)setgroups },	/* 80 = setgroups */
 	{ SYF_MPSAFE | 0, (sy_call_t *)getpgrp },	/* 81 = getpgrp */
 	{ SYF_MPSAFE | AS(setpgid_args), (sy_call_t *)setpgid },	/* 82 = setpgid */
-	{ AS(ia32_setitimer_args), (sy_call_t *)ia32_setitimer },	/* 83 = ia32_setitimer */
+	{ AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer },	/* 83 = freebsd32_setitimer */
 	{ 0, (sy_call_t *)nosys },			/* 84 = obsolete owait */
 	{ 0, (sy_call_t *)nosys },			/* 85 = obsolete oswapon */
 	{ 0, (sy_call_t *)nosys },			/* 86 = obsolete ogetitimer */
@@ -118,7 +118,7 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(dup2_args), (sy_call_t *)dup2 },	/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys },			/* 91 = getdopt */
 	{ SYF_MPSAFE | AS(fcntl_args), (sy_call_t *)fcntl },	/* 92 = fcntl */
-	{ AS(ia32_select_args), (sy_call_t *)ia32_select },	/* 93 = ia32_select */
+	{ AS(freebsd32_select_args), (sy_call_t *)freebsd32_select },	/* 93 = freebsd32_select */
 	{ 0, (sy_call_t *)nosys },			/* 94 = setdopt */
 	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
 	{ SYF_MPSAFE | AS(setpriority_args), (sy_call_t *)setpriority },	/* 96 = setpriority */
@@ -141,13 +141,13 @@ struct sysent ia32_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 113 = obsolete orecvmsg */
 	{ 0, (sy_call_t *)nosys },			/* 114 = obsolete osendmsg */
 	{ 0, (sy_call_t *)nosys },			/* 115 = obsolete vtrace */
-	{ AS(ia32_gettimeofday_args), (sy_call_t *)ia32_gettimeofday },	/* 116 = ia32_gettimeofday */
-	{ AS(ia32_getrusage_args), (sy_call_t *)ia32_getrusage },	/* 117 = ia32_getrusage */
+	{ AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday },	/* 116 = freebsd32_gettimeofday */
+	{ AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage },	/* 117 = freebsd32_getrusage */
 	{ SYF_MPSAFE | AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 119 = resuba */
-	{ AS(ia32_readv_args), (sy_call_t *)ia32_readv },	/* 120 = ia32_readv */
-	{ AS(ia32_writev_args), (sy_call_t *)ia32_writev },	/* 121 = ia32_writev */
-	{ AS(ia32_settimeofday_args), (sy_call_t *)ia32_settimeofday },	/* 122 = ia32_settimeofday */
+	{ AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv },	/* 120 = freebsd32_readv */
+	{ AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev },	/* 121 = freebsd32_writev */
+	{ AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday },	/* 122 = freebsd32_settimeofday */
 	{ AS(fchown_args), (sy_call_t *)fchown },	/* 123 = fchown */
 	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 124 = fchmod */
 	{ SYF_MPSAFE | AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 125 = recvfrom */
@@ -163,9 +163,9 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(socketpair_args), (sy_call_t *)socketpair },	/* 135 = socketpair */
 	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 136 = mkdir */
 	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 137 = rmdir */
-	{ AS(ia32_utimes_args), (sy_call_t *)ia32_utimes },	/* 138 = ia32_utimes */
+	{ AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes },	/* 138 = freebsd32_utimes */
 	{ 0, (sy_call_t *)nosys },			/* 139 = obsolete 4.2 sigreturn */
-	{ AS(ia32_adjtime_args), (sy_call_t *)ia32_adjtime },	/* 140 = ia32_adjtime */
+	{ AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime },	/* 140 = freebsd32_adjtime */
 	{ 0, (sy_call_t *)nosys },			/* 141 = obsolete ogetpeername */
 	{ 0, (sy_call_t *)nosys },			/* 142 = obsolete ogethostid */
 	{ 0, (sy_call_t *)nosys },			/* 143 = obsolete sethostid */
@@ -182,8 +182,8 @@ struct sysent ia32_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 154 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 155 = nfssvc */
 	{ AS(getdirentries_args), (sy_call_t *)getdirentries },	/* 156 = getdirentries */
-	{ AS(ia32_statfs_args), (sy_call_t *)ia32_statfs },	/* 157 = ia32_statfs */
-	{ AS(ia32_fstatfs_args), (sy_call_t *)ia32_fstatfs },	/* 158 = ia32_fstatfs */
+	{ AS(freebsd32_statfs_args), (sy_call_t *)freebsd32_statfs },	/* 157 = freebsd32_statfs */
+	{ AS(freebsd32_fstatfs_args), (sy_call_t *)freebsd32_fstatfs },	/* 158 = freebsd32_fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 160 = nosys */
 	{ AS(getfh_args), (sy_call_t *)getfh },		/* 161 = getfh */
@@ -194,12 +194,12 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(rtprio_args), (sy_call_t *)rtprio },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 168 = nosys */
-	{ AS(ia32_semsys_args), (sy_call_t *)ia32_semsys },	/* 169 = ia32_semsys */
-	{ AS(ia32_msgsys_args), (sy_call_t *)ia32_msgsys },	/* 170 = ia32_msgsys */
-	{ AS(ia32_shmsys_args), (sy_call_t *)ia32_shmsys },	/* 171 = ia32_shmsys */
+	{ AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys },	/* 169 = freebsd32_semsys */
+	{ AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys },	/* 170 = freebsd32_msgsys */
+	{ AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys },	/* 171 = freebsd32_shmsys */
 	{ 0, (sy_call_t *)nosys },			/* 172 = nosys */
-	{ AS(ia32_pread_args), (sy_call_t *)ia32_pread },	/* 173 = ia32_pread */
-	{ AS(ia32_pwrite_args), (sy_call_t *)ia32_pwrite },	/* 174 = ia32_pwrite */
+	{ AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread },	/* 173 = freebsd32_pread */
+	{ AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite },	/* 174 = freebsd32_pwrite */
 	{ 0, (sy_call_t *)nosys },			/* 175 = nosys */
 	{ SYF_MPSAFE | AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys },			/* 177 = sfork */
@@ -213,21 +213,21 @@ struct sysent ia32_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys },			/* 187 = lfs_segwait */
-	{ AS(ia32_stat_args), (sy_call_t *)ia32_stat },	/* 188 = ia32_stat */
-	{ AS(ia32_fstat_args), (sy_call_t *)ia32_fstat },	/* 189 = ia32_fstat */
-	{ AS(ia32_lstat_args), (sy_call_t *)ia32_lstat },	/* 190 = ia32_lstat */
+	{ AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat },	/* 188 = freebsd32_stat */
+	{ AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat },	/* 189 = freebsd32_fstat */
+	{ AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat },	/* 190 = freebsd32_lstat */
 	{ AS(pathconf_args), (sy_call_t *)pathconf },	/* 191 = pathconf */
 	{ SYF_MPSAFE | AS(fpathconf_args), (sy_call_t *)fpathconf },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys },			/* 193 = nosys */
 	{ SYF_MPSAFE | AS(__getrlimit_args), (sy_call_t *)getrlimit },	/* 194 = getrlimit */
 	{ SYF_MPSAFE | AS(__setrlimit_args), (sy_call_t *)setrlimit },	/* 195 = setrlimit */
 	{ AS(getdirentries_args), (sy_call_t *)getdirentries },	/* 196 = getdirentries */
-	{ AS(ia32_mmap_args), (sy_call_t *)ia32_mmap },	/* 197 = ia32_mmap */
+	{ AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap },	/* 197 = freebsd32_mmap */
 	{ 0, (sy_call_t *)nosys },			/* 198 = __syscall */
-	{ AS(ia32_lseek_args), (sy_call_t *)ia32_lseek },	/* 199 = ia32_lseek */
-	{ AS(ia32_truncate_args), (sy_call_t *)ia32_truncate },	/* 200 = ia32_truncate */
-	{ AS(ia32_ftruncate_args), (sy_call_t *)ia32_ftruncate },	/* 201 = ia32_ftruncate */
-	{ SYF_MPSAFE | AS(ia32_sysctl_args), (sy_call_t *)ia32_sysctl },	/* 202 = ia32_sysctl */
+	{ AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek },	/* 199 = freebsd32_lseek */
+	{ AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate },	/* 200 = freebsd32_truncate */
+	{ AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate },	/* 201 = freebsd32_ftruncate */
+	{ SYF_MPSAFE | AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl },	/* 202 = freebsd32_sysctl */
 	{ SYF_MPSAFE | AS(mlock_args), (sy_call_t *)mlock },	/* 203 = mlock */
 	{ SYF_MPSAFE | AS(munlock_args), (sy_call_t *)munlock },	/* 204 = munlock */
 	{ AS(undelete_args), (sy_call_t *)undelete },	/* 205 = undelete */
@@ -361,15 +361,15 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min },	/* 333 = sched_get_priority_min */
 	{ SYF_MPSAFE | AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval },	/* 334 = sched_rr_get_interval */
 	{ AS(utrace_args), (sy_call_t *)utrace },	/* 335 = utrace */
-	{ compat4(SYF_MPSAFE | AS(freebsd4_ia32_sendfile_args),ia32_sendfile) },	/* 336 = old ia32_sendfile */
+	{ compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile) },	/* 336 = old freebsd32_sendfile */
 	{ AS(kldsym_args), (sy_call_t *)kldsym },	/* 337 = kldsym */
 	{ SYF_MPSAFE | AS(jail_args), (sy_call_t *)jail },	/* 338 = jail */
 	{ 0, (sy_call_t *)nosys },			/* 339 = pioctl */
 	{ SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask },	/* 340 = sigprocmask */
 	{ SYF_MPSAFE | AS(sigsuspend_args), (sy_call_t *)sigsuspend },	/* 341 = sigsuspend */
-	{ compat4(AS(freebsd4_ia32_sigaction_args),ia32_sigaction) },	/* 342 = old ia32_sigaction */
+	{ compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction) },	/* 342 = old freebsd32_sigaction */
 	{ SYF_MPSAFE | AS(sigpending_args), (sy_call_t *)sigpending },	/* 343 = sigpending */
-	{ compat4(SYF_MPSAFE | AS(freebsd4_ia32_sigreturn_args),ia32_sigreturn) },	/* 344 = old ia32_sigreturn */
+	{ compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn) },	/* 344 = old freebsd32_sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 345 = sigtimedwait */
 	{ 0, (sy_call_t *)nosys },			/* 346 = sigwaitinfo */
 	{ SYF_MPSAFE | AS(__acl_get_file_args), (sy_call_t *)__acl_get_file },	/* 347 = __acl_get_file */
@@ -388,7 +388,7 @@ struct sysent ia32_sysent[] = {
 	{ SYF_MPSAFE | AS(getresuid_args), (sy_call_t *)getresuid },	/* 360 = getresuid */
 	{ SYF_MPSAFE | AS(getresgid_args), (sy_call_t *)getresgid },	/* 361 = getresgid */
 	{ SYF_MPSAFE | 0, (sy_call_t *)kqueue },	/* 362 = kqueue */
-	{ SYF_MPSAFE | AS(ia32_kevent_args), (sy_call_t *)ia32_kevent },	/* 363 = ia32_kevent */
+	{ SYF_MPSAFE | AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent },	/* 363 = freebsd32_kevent */
 	{ 0, (sy_call_t *)nosys },			/* 364 = __cap_get_proc */
 	{ 0, (sy_call_t *)nosys },			/* 365 = __cap_set_proc */
 	{ 0, (sy_call_t *)nosys },			/* 366 = __cap_get_fd */
@@ -418,7 +418,7 @@ struct sysent ia32_sysent[] = {
 	{ AS(kenv_args), (sy_call_t *)kenv },		/* 390 = kenv */
 	{ AS(lchflags_args), (sy_call_t *)lchflags },	/* 391 = lchflags */
 	{ AS(uuidgen_args), (sy_call_t *)uuidgen },	/* 392 = uuidgen */
-	{ SYF_MPSAFE | AS(ia32_sendfile_args), (sy_call_t *)ia32_sendfile },	/* 393 = ia32_sendfile */
+	{ SYF_MPSAFE | AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile },	/* 393 = freebsd32_sendfile */
 	{ 0, (sy_call_t *)nosys },			/* 394 = mac_syscall */
 	{ 0, (sy_call_t *)nosys },			/* 395 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 396 = nosys */
@@ -441,8 +441,8 @@ struct sysent ia32_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 413 = extattr_get_link */
 	{ 0, (sy_call_t *)nosys },			/* 414 = extattr_delete_link */
 	{ 0, (sy_call_t *)nosys },			/* 415 = __mac_execve */
-	{ AS(ia32_sigaction_args), (sy_call_t *)ia32_sigaction },	/* 416 = ia32_sigaction */
-	{ SYF_MPSAFE | AS(ia32_sigreturn_args), (sy_call_t *)ia32_sigreturn },	/* 417 = ia32_sigreturn */
+	{ AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction },	/* 416 = freebsd32_sigaction */
+	{ SYF_MPSAFE | AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn },	/* 417 = freebsd32_sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 418 = __xstat */
 	{ 0, (sy_call_t *)nosys },			/* 419 = __xfstat */
 	{ 0, (sy_call_t *)nosys },			/* 420 = __xlstat */