Author: kib
Date: Tue May 23 09:30:42 2017
New Revision: 318737
URL: https://svnweb.freebsd.org/changeset/base/318737
Log:
Regen.
Modified:
head/sys/compat/freebsd32/freebsd32_proto.h
head/sys/compat/freebsd32/freebsd32_syscall.h
head/sys/compat/freebsd32/freebsd32_syscalls.c
head/sys/compat/freebsd32/freebsd32_sysent.c
head/sys/compat/freebsd32/freebsd32_systrace_args.c
head/sys/kern/init_sysent.c
head/sys/kern/syscalls.c
head/sys/kern/systrace_args.c
head/sys/sys/syscall.h
head/sys/sys/syscall.mk
head/sys/sys/sysproto.h
Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h Tue May 23 09:29:05 2017
(r318736)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Tue May 23 09:30:42 2017
(r318737)
@@ -161,24 +161,6 @@ struct freebsd32_shmsys_args {
char a3_l_[PADL_(uint32_t)]; uint32_t a3; char a3_r_[PADR_(uint32_t)];
char a4_l_[PADL_(uint32_t)]; uint32_t a4; char a4_r_[PADR_(uint32_t)];
};
-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 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 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 freebsd32_getdirentries_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
- char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
- char basep_l_[PADL_(int32_t *)]; int32_t * basep; char
basep_r_[PADR_(int32_t *)];
-};
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)];
@@ -551,12 +533,6 @@ struct freebsd32_fexecve_args {
char argv_l_[PADL_(uint32_t *)]; uint32_t * argv; char
argv_r_[PADR_(uint32_t *)];
char envv_l_[PADL_(uint32_t *)]; uint32_t * envv; char
envv_r_[PADR_(uint32_t *)];
};
-struct freebsd32_fstatat_args {
- char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
- char buf_l_[PADL_(struct stat *)]; struct stat * buf; char
buf_r_[PADR_(struct stat *)];
- char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
struct freebsd32_futimesat_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
@@ -697,6 +673,26 @@ struct freebsd32_utimensat_args {
char times_l_[PADL_(struct timespec *)]; struct timespec * times; char
times_r_[PADR_(struct timespec *)];
char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
};
+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 freebsd32_fstatat_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char buf_l_[PADL_(struct stat32 *)]; struct stat32 * buf; char
buf_r_[PADR_(struct stat32 *)];
+ char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
+};
+struct freebsd32_fhstat_args {
+ char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle *
u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
+ char sb_l_[PADL_(struct stat32 *)]; struct stat32 * sb; char
sb_r_[PADR_(struct stat32 *)];
+};
+struct freebsd32_getdirentries_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
+ char count_l_[PADL_(size_t)]; size_t count; char
count_r_[PADR_(size_t)];
+ char basep_l_[PADL_(int32_t *)]; int32_t * basep; char
basep_r_[PADR_(int32_t *)];
+};
#if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
#define PAD64_REQUIRED
#endif
@@ -723,10 +719,6 @@ int freebsd32_sysarch(struct thread *, s
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_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_getdirentries(struct thread *, struct
freebsd32_getdirentries_args *);
int freebsd32_sysctl(struct thread *, struct freebsd32_sysctl_args *);
int freebsd32_futimes(struct thread *, struct freebsd32_futimes_args *);
int freebsd32_msgsnd(struct thread *, struct freebsd32_msgsnd_args *);
@@ -800,7 +792,6 @@ int freebsd32_cpuset_getid(struct thread
int freebsd32_cpuset_getaffinity(struct thread *, struct
freebsd32_cpuset_getaffinity_args *);
int freebsd32_cpuset_setaffinity(struct thread *, struct
freebsd32_cpuset_setaffinity_args *);
int freebsd32_fexecve(struct thread *, struct freebsd32_fexecve_args *);
-int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *);
int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *);
int freebsd32_jail_get(struct thread *, struct freebsd32_jail_get_args *);
int freebsd32_jail_set(struct thread *, struct freebsd32_jail_set_args *);
@@ -828,6 +819,10 @@ int freebsd32_procctl(struct thread *, s
int freebsd32_ppoll(struct thread *, struct freebsd32_ppoll_args *);
int freebsd32_futimens(struct thread *, struct freebsd32_futimens_args *);
int freebsd32_utimensat(struct thread *, struct freebsd32_utimensat_args *);
+int freebsd32_fstat(struct thread *, struct freebsd32_fstat_args *);
+int freebsd32_fstatat(struct thread *, struct freebsd32_fstatat_args *);
+int freebsd32_fhstat(struct thread *, struct freebsd32_fhstat_args *);
+int freebsd32_getdirentries(struct thread *, struct
freebsd32_getdirentries_args *);
#ifdef COMPAT_43
@@ -1132,7 +1127,82 @@ int freebsd10_freebsd32_pipe(struct thre
#endif /* COMPAT_FREEBSD10 */
+
+#ifdef COMPAT_FREEBSD11
+
+#if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
+#define PAD64_REQUIRED
+#endif
+struct freebsd11_freebsd32_mknod_args {
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
+ char dev_l_[PADL_(int)]; int dev; char dev_r_[PADR_(int)];
+};
+struct freebsd11_freebsd32_stat_args {
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char ub_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 *
ub; char ub_r_[PADR_(struct freebsd11_stat32 *)];
+};
+struct freebsd11_freebsd32_fstat_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char ub_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 *
ub; char ub_r_[PADR_(struct freebsd11_stat32 *)];
+};
+struct freebsd11_freebsd32_lstat_args {
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char ub_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 *
ub; char ub_r_[PADR_(struct freebsd11_stat32 *)];
+};
+struct freebsd11_freebsd32_getdirentries_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
+ char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
+ char basep_l_[PADL_(int32_t *)]; int32_t * basep; char
basep_r_[PADR_(int32_t *)];
+};
+struct freebsd11_freebsd32_getdents_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
+ char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)];
+};
+struct freebsd11_freebsd32_fhstat_args {
+ char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle *
u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
+ char sb_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32 *
sb; char sb_r_[PADR_(struct freebsd11_stat32 *)];
+};
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+struct freebsd11_freebsd32_fstatat_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char buf_l_[PADL_(struct freebsd11_stat32 *)]; struct freebsd11_stat32
* buf; char buf_r_[PADR_(struct freebsd11_stat32 *)];
+ char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
+};
+struct freebsd11_freebsd32_mknodat_args {
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
+ char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
+ char dev_l_[PADL_(uint32_t)]; uint32_t dev; char
dev_r_[PADR_(uint32_t)];
+};
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+int freebsd11_freebsd32_mknod(struct thread *, struct
freebsd11_freebsd32_mknod_args *);
+int freebsd11_freebsd32_stat(struct thread *, struct
freebsd11_freebsd32_stat_args *);
+int freebsd11_freebsd32_fstat(struct thread *, struct
freebsd11_freebsd32_fstat_args *);
+int freebsd11_freebsd32_lstat(struct thread *, struct
freebsd11_freebsd32_lstat_args *);
+int freebsd11_freebsd32_getdirentries(struct thread *, struct
freebsd11_freebsd32_getdirentries_args *);
+int freebsd11_freebsd32_getdents(struct thread *, struct
freebsd11_freebsd32_getdents_args *);
+int freebsd11_freebsd32_fhstat(struct thread *, struct
freebsd11_freebsd32_fhstat_args *);
+int freebsd11_freebsd32_fstatat(struct thread *, struct
freebsd11_freebsd32_fstatat_args *);
+int freebsd11_freebsd32_mknodat(struct thread *, struct
freebsd11_freebsd32_mknodat_args *);
+
+#endif /* COMPAT_FREEBSD11 */
+
#define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_mknod AUE_MKNOD
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT
#define FREEBSD32_SYS_AUE_ofreebsd32_lseek AUE_LSEEK
#define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG
@@ -1176,10 +1246,10 @@ int freebsd10_freebsd32_pipe(struct thre
#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pread AUE_PREAD
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_pwrite AUE_PWRITE
-#define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT
-#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT
-#define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT
-#define FREEBSD32_SYS_AUE_freebsd32_getdirentries
AUE_GETDIRENTRIES
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_stat AUE_STAT
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_fstat AUE_FSTAT
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_lstat AUE_LSTAT
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_getdirentries
AUE_GETDIRENTRIES
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_mmap AUE_MMAP
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_lseek AUE_LSEEK
#define FREEBSD32_SYS_AUE_freebsd6_freebsd32_truncate AUE_TRUNCATE
@@ -1203,10 +1273,12 @@ int freebsd10_freebsd32_pipe(struct thre
#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_AIO_READ
#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_AIO_WRITE
#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_LIO_LISTIO
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_getdents AUE_O_GETDENTS
#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_fhstatfs AUE_FHSTATFS
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_fhstat AUE_FHSTAT
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kldstat AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_aio_return AUE_AIO_RETURN
@@ -1261,8 +1333,9 @@ int freebsd10_freebsd32_pipe(struct thre
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getaffinity AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setaffinity AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_fexecve AUE_FEXECVE
-#define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_fstatat AUE_FSTATAT
#define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT
+#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_mknodat AUE_MKNODAT
#define FREEBSD32_SYS_AUE_freebsd32_jail_get AUE_JAIL_GET
#define FREEBSD32_SYS_AUE_freebsd32_jail_set AUE_JAIL_SET
#define FREEBSD32_SYS_AUE_freebsd32_semctl AUE_SEMCTL
@@ -1283,6 +1356,10 @@ int freebsd10_freebsd32_pipe(struct thre
#define FREEBSD32_SYS_AUE_freebsd32_ppoll AUE_POLL
#define FREEBSD32_SYS_AUE_freebsd32_futimens AUE_FUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_utimensat AUE_FUTIMESAT
+#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT
+#define FREEBSD32_SYS_AUE_freebsd32_fstatat AUE_FSTATAT
+#define FREEBSD32_SYS_AUE_freebsd32_fhstat AUE_FHSTAT
+#define FREEBSD32_SYS_AUE_freebsd32_getdirentries
AUE_GETDIRENTRIES
#undef PAD_
#undef PADL_
Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Tue May 23 09:29:05
2017 (r318736)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Tue May 23 09:30:42
2017 (r318737)
@@ -19,7 +19,7 @@
/* 11 is obsolete execv */
#define FREEBSD32_SYS_chdir 12
#define FREEBSD32_SYS_fchdir 13
-#define FREEBSD32_SYS_mknod 14
+#define FREEBSD32_SYS_freebsd11_freebsd32_mknod 14
#define FREEBSD32_SYS_chmod 15
#define FREEBSD32_SYS_chown 16
#define FREEBSD32_SYS_break 17
@@ -171,14 +171,14 @@
#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_freebsd11_freebsd32_stat 188
+#define FREEBSD32_SYS_freebsd11_freebsd32_fstat 189
+#define FREEBSD32_SYS_freebsd11_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_freebsd32_getdirentries 196
+#define FREEBSD32_SYS_freebsd11_freebsd32_getdirentries 196
/* 197 is freebsd6 freebsd32_mmap */
#define FREEBSD32_SYS___syscall 198
/* 199 is freebsd6 freebsd32_lseek */
@@ -224,19 +224,19 @@
#define FREEBSD32_SYS_freebsd32_aio_read 255
#define FREEBSD32_SYS_freebsd32_aio_write 256
#define FREEBSD32_SYS_freebsd32_lio_listio 257
-#define FREEBSD32_SYS_getdents 272
+#define FREEBSD32_SYS_freebsd11_freebsd32_getdents 272
#define FREEBSD32_SYS_lchmod 274
#define FREEBSD32_SYS_netbsd_lchown 275
#define FREEBSD32_SYS_freebsd32_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_freebsd11_nstat 278
+#define FREEBSD32_SYS_freebsd11_nfstat 279
+#define FREEBSD32_SYS_freebsd11_nlstat 280
#define FREEBSD32_SYS_freebsd32_preadv 289
#define FREEBSD32_SYS_freebsd32_pwritev 290
/* 297 is freebsd4 freebsd32_fhstatfs */
#define FREEBSD32_SYS_fhopen 298
-#define FREEBSD32_SYS_fhstat 299
+#define FREEBSD32_SYS_freebsd11_freebsd32_fhstat 299
#define FREEBSD32_SYS_modnext 300
#define FREEBSD32_SYS_freebsd32_modstat 301
#define FREEBSD32_SYS_modfnext 302
@@ -310,10 +310,10 @@
#define FREEBSD32_SYS_lchflags 391
#define FREEBSD32_SYS_uuidgen 392
#define FREEBSD32_SYS_freebsd32_sendfile 393
-#define FREEBSD32_SYS_getfsstat 395
-#define FREEBSD32_SYS_statfs 396
-#define FREEBSD32_SYS_fstatfs 397
-#define FREEBSD32_SYS_fhstatfs 398
+#define FREEBSD32_SYS_freebsd11_getfsstat 395
+#define FREEBSD32_SYS_freebsd11_statfs 396
+#define FREEBSD32_SYS_freebsd11_fstatfs 397
+#define FREEBSD32_SYS_freebsd11_fhstatfs 398
#define FREEBSD32_SYS_ksem_close 400
#define FREEBSD32_SYS_ksem_post 401
#define FREEBSD32_SYS_ksem_wait 402
@@ -398,12 +398,12 @@
#define FREEBSD32_SYS_fchmodat 490
#define FREEBSD32_SYS_fchownat 491
#define FREEBSD32_SYS_freebsd32_fexecve 492
-#define FREEBSD32_SYS_freebsd32_fstatat 493
+#define FREEBSD32_SYS_freebsd11_freebsd32_fstatat 493
#define FREEBSD32_SYS_freebsd32_futimesat 494
#define FREEBSD32_SYS_linkat 495
#define FREEBSD32_SYS_mkdirat 496
#define FREEBSD32_SYS_mkfifoat 497
-#define FREEBSD32_SYS_mknodat 498
+#define FREEBSD32_SYS_freebsd11_freebsd32_mknodat 498
#define FREEBSD32_SYS_openat 499
#define FREEBSD32_SYS_readlinkat 500
#define FREEBSD32_SYS_renameat 501
@@ -458,4 +458,13 @@
#define FREEBSD32_SYS_numa_getaffinity 548
#define FREEBSD32_SYS_numa_setaffinity 549
#define FREEBSD32_SYS_fdatasync 550
-#define FREEBSD32_SYS_MAXSYSCALL 551
+#define FREEBSD32_SYS_freebsd32_fstat 551
+#define FREEBSD32_SYS_freebsd32_fstatat 552
+#define FREEBSD32_SYS_freebsd32_fhstat 553
+#define FREEBSD32_SYS_freebsd32_getdirentries 554
+#define FREEBSD32_SYS_statfs 555
+#define FREEBSD32_SYS_fstatfs 556
+#define FREEBSD32_SYS_getfsstat 557
+#define FREEBSD32_SYS_fhstatfs 558
+#define FREEBSD32_SYS_mknodat 559
+#define FREEBSD32_SYS_MAXSYSCALL 560
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Tue May 23 09:29:05
2017 (r318736)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Tue May 23 09:30:42
2017 (r318737)
@@ -23,7 +23,7 @@ const char *freebsd32_syscallnames[] = {
"obs_execv", /* 11 = obsolete execv */
"chdir", /* 12 = chdir */
"fchdir", /* 13 = fchdir */
- "mknod", /* 14 = mknod */
+ "compat11.freebsd32_mknod", /* 14 = freebsd11
freebsd32_mknod */
"chmod", /* 15 = chmod */
"chown", /* 16 = chown */
"break", /* 17 = break */
@@ -197,15 +197,15 @@ const char *freebsd32_syscallnames[] = {
"#185", /* 185 = lfs_markv */
"#186", /* 186 = lfs_segclean */
"#187", /* 187 = lfs_segwait */
- "freebsd32_stat", /* 188 = freebsd32_stat */
- "freebsd32_fstat", /* 189 = freebsd32_fstat */
- "freebsd32_lstat", /* 190 = freebsd32_lstat */
+ "compat11.freebsd32_stat", /* 188 = freebsd11
freebsd32_stat */
+ "compat11.freebsd32_fstat", /* 189 = freebsd11
freebsd32_fstat */
+ "compat11.freebsd32_lstat", /* 190 = freebsd11
freebsd32_lstat */
"pathconf", /* 191 = pathconf */
"fpathconf", /* 192 = fpathconf */
"#193", /* 193 = nosys */
"getrlimit", /* 194 = getrlimit */
"setrlimit", /* 195 = setrlimit */
- "freebsd32_getdirentries", /* 196 =
freebsd32_getdirentries */
+ "compat11.freebsd32_getdirentries", /* 196 = freebsd11
freebsd32_getdirentries */
"compat6.freebsd32_mmap", /* 197 = freebsd6
freebsd32_mmap */
"__syscall", /* 198 = __syscall */
"compat6.freebsd32_lseek", /* 199 = freebsd6
freebsd32_lseek */
@@ -281,15 +281,15 @@ const char *freebsd32_syscallnames[] = {
"#269", /* 269 = nosys */
"#270", /* 270 = nosys */
"#271", /* 271 = nosys */
- "getdents", /* 272 = getdents */
+ "compat11.freebsd32_getdents", /* 272 = freebsd11
freebsd32_getdents */
"#273", /* 273 = nosys */
"lchmod", /* 274 = lchmod */
"netbsd_lchown", /* 275 = netbsd_lchown */
"freebsd32_lutimes", /* 276 = freebsd32_lutimes */
"netbsd_msync", /* 277 = netbsd_msync */
- "nstat", /* 278 = nstat */
- "nfstat", /* 279 = nfstat */
- "nlstat", /* 280 = nlstat */
+ "compat11.nstat", /* 278 = freebsd11 nstat */
+ "compat11.nfstat", /* 279 = freebsd11 nfstat */
+ "compat11.nlstat", /* 280 = freebsd11 nlstat */
"#281", /* 281 = nosys */
"#282", /* 282 = nosys */
"#283", /* 283 = nosys */
@@ -308,7 +308,7 @@ const char *freebsd32_syscallnames[] = {
"#296", /* 296 = nosys */
"compat4.freebsd32_fhstatfs", /* 297 = freebsd4
freebsd32_fhstatfs */
"fhopen", /* 298 = fhopen */
- "fhstat", /* 299 = fhstat */
+ "compat11.freebsd32_fhstat", /* 299 = freebsd11
freebsd32_fhstat */
"modnext", /* 300 = modnext */
"freebsd32_modstat", /* 301 = freebsd32_modstat */
"modfnext", /* 302 = modfnext */
@@ -404,10 +404,10 @@ const char *freebsd32_syscallnames[] = {
"uuidgen", /* 392 = uuidgen */
"freebsd32_sendfile", /* 393 = freebsd32_sendfile */
"#394", /* 394 = mac_syscall */
- "getfsstat", /* 395 = getfsstat */
- "statfs", /* 396 = statfs */
- "fstatfs", /* 397 = fstatfs */
- "fhstatfs", /* 398 = fhstatfs */
+ "compat11.getfsstat", /* 395 = freebsd11 getfsstat */
+ "compat11.statfs", /* 396 = freebsd11 statfs */
+ "compat11.fstatfs", /* 397 = freebsd11 fstatfs */
+ "compat11.fhstatfs", /* 398 = freebsd11 fhstatfs */
"#399", /* 399 = nosys */
"ksem_close", /* 400 = ksem_close */
"ksem_post", /* 401 = ksem_post */
@@ -515,12 +515,12 @@ const char *freebsd32_syscallnames[] = {
"fchmodat", /* 490 = fchmodat */
"fchownat", /* 491 = fchownat */
"freebsd32_fexecve", /* 492 = freebsd32_fexecve */
- "freebsd32_fstatat", /* 493 = freebsd32_fstatat */
+ "compat11.freebsd32_fstatat", /* 493 = freebsd11
freebsd32_fstatat */
"freebsd32_futimesat", /* 494 = freebsd32_futimesat */
"linkat", /* 495 = linkat */
"mkdirat", /* 496 = mkdirat */
"mkfifoat", /* 497 = mkfifoat */
- "mknodat", /* 498 = mknodat */
+ "compat11.freebsd32_mknodat", /* 498 = freebsd11
freebsd32_mknodat */
"openat", /* 499 = openat */
"readlinkat", /* 500 = readlinkat */
"renameat", /* 501 = renameat */
@@ -583,4 +583,13 @@ const char *freebsd32_syscallnames[] = {
"numa_getaffinity", /* 548 = numa_getaffinity */
"numa_setaffinity", /* 549 = numa_setaffinity */
"fdatasync", /* 550 = fdatasync */
+ "freebsd32_fstat", /* 551 = freebsd32_fstat */
+ "freebsd32_fstatat", /* 552 = freebsd32_fstatat */
+ "freebsd32_fhstat", /* 553 = freebsd32_fhstat */
+ "freebsd32_getdirentries", /* 554 =
freebsd32_getdirentries */
+ "statfs", /* 555 = statfs */
+ "fstatfs", /* 556 = fstatfs */
+ "getfsstat", /* 557 = getfsstat */
+ "fhstatfs", /* 558 = fhstatfs */
+ "mknodat", /* 559 = mknodat */
};
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Tue May 23 09:29:05
2017 (r318736)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Tue May 23 09:30:42
2017 (r318737)
@@ -47,6 +47,12 @@
#define compat10(n, name) 0, (sy_call_t *)nosys
#endif
+#ifdef COMPAT_FREEBSD11
+#define compat11(n, name) n, (sy_call_t *)__CONCAT(freebsd11_,name)
+#else
+#define compat11(n, name) 0, (sy_call_t *)nosys
+#endif
+
/* The casts are bogus but will do for now. */
struct sysent freebsd32_sysent[] = {
#if !defined(PAD64_REQUIRED) && (defined(__powerpc__) || defined(__mips__))
@@ -66,7 +72,7 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 11 = obsolete execv */
{ AS(chdir_args), (sy_call_t *)sys_chdir, AUE_CHDIR, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 12 = chdir */
{ AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 13 = fchdir */
- { AS(mknod_args), (sy_call_t *)sys_mknod, AUE_MKNOD, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 14 = mknod */
+ { compat11(AS(freebsd11_freebsd32_mknod_args),freebsd32_mknod),
AUE_MKNOD, NULL, 0, 0, 0, SY_THR_STATIC }, /* 14 = freebsd11
freebsd32_mknod */
{ AS(chmod_args), (sy_call_t *)sys_chmod, AUE_CHMOD, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 15 = chmod */
{ AS(chown_args), (sy_call_t *)sys_chown, AUE_CHOWN, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 16 = chown */
{ AS(obreak_args), (sy_call_t *)sys_obreak, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 17 = break */
@@ -240,15 +246,15 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 185 = lfs_markv */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 186 = lfs_segclean */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 187 = lfs_segwait */
- { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT, NULL,
0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd32_stat */
- { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = freebsd32_fstat */
- { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd32_lstat */
+ { compat11(AS(freebsd11_freebsd32_stat_args),freebsd32_stat), AUE_STAT,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 188 = freebsd11 freebsd32_stat */
+ { compat11(AS(freebsd11_freebsd32_fstat_args),freebsd32_fstat),
AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 189 = freebsd11
freebsd32_fstat */
+ { compat11(AS(freebsd11_freebsd32_lstat_args),freebsd32_lstat),
AUE_LSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 190 = freebsd11
freebsd32_lstat */
{ AS(pathconf_args), (sy_call_t *)sys_pathconf, AUE_PATHCONF, NULL, 0,
0, 0, SY_THR_STATIC }, /* 191 = pathconf */
{ AS(fpathconf_args), (sy_call_t *)sys_fpathconf, AUE_FPATHCONF, NULL,
0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 192 = fpathconf */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 193 = nosys */
{ AS(__getrlimit_args), (sy_call_t *)sys_getrlimit, AUE_GETRLIMIT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 194 = getrlimit */
{ AS(__setrlimit_args), (sy_call_t *)sys_setrlimit, AUE_SETRLIMIT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 195 = setrlimit */
- { AS(freebsd32_getdirentries_args), (sy_call_t
*)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 196 = freebsd32_getdirentries */
+ {
compat11(AS(freebsd11_freebsd32_getdirentries_args),freebsd32_getdirentries),
AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 196 =
freebsd11 freebsd32_getdirentries */
{ compat6(AS(freebsd6_freebsd32_mmap_args),freebsd32_mmap), AUE_MMAP,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 197 = freebsd6
freebsd32_mmap */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },
/* 198 = __syscall */
{ compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek),
AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 199 = freebsd6
freebsd32_lseek */
@@ -324,15 +330,15 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 269 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 270 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 271 = nosys */
- { AS(getdents_args), (sy_call_t *)sys_getdents, AUE_O_GETDENTS, NULL,
0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 272 = getdents */
+ { compat11(AS(freebsd11_freebsd32_getdents_args),freebsd32_getdents),
AUE_O_GETDENTS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 272 = freebsd11
freebsd32_getdents */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 273 = nosys */
{ AS(lchmod_args), (sy_call_t *)sys_lchmod, AUE_LCHMOD, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 274 = lchmod */
{ AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 275 = netbsd_lchown */
{ AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes,
AUE_LUTIMES, NULL, 0, 0, 0, SY_THR_STATIC }, /* 276 = freebsd32_lutimes */
{ AS(msync_args), (sy_call_t *)sys_msync, AUE_MSYNC, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 277 = netbsd_msync */
- { AS(nstat_args), (sy_call_t *)sys_nstat, AUE_STAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 278 = nstat */
- { AS(nfstat_args), (sy_call_t *)sys_nfstat, AUE_FSTAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 279 = nfstat */
- { AS(nlstat_args), (sy_call_t *)sys_nlstat, AUE_LSTAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 280 = nlstat */
+ { compat11(AS(freebsd11_nstat_args),nstat), AUE_STAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 278 = freebsd11 nstat */
+ { compat11(AS(freebsd11_nfstat_args),nfstat), AUE_FSTAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 279 = freebsd11 nfstat */
+ { compat11(AS(freebsd11_nlstat_args),nlstat), AUE_LSTAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 280 = freebsd11 nlstat */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 281 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 282 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 283 = nosys */
@@ -351,7 +357,7 @@ struct sysent freebsd32_sysent[] = {
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 296 = nosys */
{ compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs),
AUE_FHSTATFS, NULL, 0, 0, 0, SY_THR_STATIC }, /* 297 = freebsd4
freebsd32_fhstatfs */
{ AS(fhopen_args), (sy_call_t *)sys_fhopen, AUE_FHOPEN, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 298 = fhopen */
- { AS(fhstat_args), (sy_call_t *)sys_fhstat, AUE_FHSTAT, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 299 = fhstat */
+ { compat11(AS(freebsd11_freebsd32_fhstat_args),freebsd32_fhstat),
AUE_FHSTAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 299 = freebsd11
freebsd32_fhstat */
{ AS(modnext_args), (sy_call_t *)sys_modnext, AUE_NULL, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 300 = modnext */
{ AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 301 = freebsd32_modstat */
{ AS(modfnext_args), (sy_call_t *)sys_modfnext, AUE_NULL, NULL, 0, 0,
0, SY_THR_STATIC }, /* 302 = modfnext */
@@ -447,10 +453,10 @@ struct sysent freebsd32_sysent[] = {
{ AS(uuidgen_args), (sy_call_t *)sys_uuidgen, AUE_NULL, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 392 = uuidgen */
{ AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile,
AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 393 =
freebsd32_sendfile */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 394 = mac_syscall */
- { AS(getfsstat_args), (sy_call_t *)sys_getfsstat, AUE_GETFSSTAT, NULL,
0, 0, 0, SY_THR_STATIC }, /* 395 = getfsstat */
- { AS(statfs_args), (sy_call_t *)sys_statfs, AUE_STATFS, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 396 = statfs */
- { AS(fstatfs_args), (sy_call_t *)sys_fstatfs, AUE_FSTATFS, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 397 = fstatfs */
- { AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0,
0, 0, SY_THR_STATIC }, /* 398 = fhstatfs */
+ { compat11(AS(freebsd11_getfsstat_args),getfsstat), AUE_GETFSSTAT,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 395 = freebsd11 getfsstat */
+ { compat11(AS(freebsd11_statfs_args),statfs), AUE_STATFS, NULL, 0, 0,
0, SY_THR_STATIC }, /* 396 = freebsd11 statfs */
+ { compat11(AS(freebsd11_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 397 = freebsd11 fstatfs */
+ { compat11(AS(freebsd11_fhstatfs_args),fhstatfs), AUE_FHSTATFS, NULL,
0, 0, 0, SY_THR_STATIC }, /* 398 = freebsd11 fhstatfs */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },
/* 399 = nosys */
{ AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0,
SY_THR_ABSENT }, /* 400 = ksem_close */
{ AS(ksem_post_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0,
SY_THR_ABSENT }, /* 401 = ksem_post */
@@ -558,12 +564,12 @@ struct sysent freebsd32_sysent[] = {
{ AS(fchmodat_args), (sy_call_t *)sys_fchmodat, AUE_FCHMODAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 490 = fchmodat */
{ AS(fchownat_args), (sy_call_t *)sys_fchownat, AUE_FCHOWNAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 491 = fchownat */
{ AS(freebsd32_fexecve_args), (sy_call_t *)freebsd32_fexecve,
AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 492 =
freebsd32_fexecve */
- { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat,
AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 493 =
freebsd32_fstatat */
+ { compat11(AS(freebsd11_freebsd32_fstatat_args),freebsd32_fstatat),
AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 493 = freebsd11
freebsd32_fstatat */
{ AS(freebsd32_futimesat_args), (sy_call_t *)freebsd32_futimesat,
AUE_FUTIMESAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 494 =
freebsd32_futimesat */
{ AS(linkat_args), (sy_call_t *)sys_linkat, AUE_LINKAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 495 = linkat */
{ AS(mkdirat_args), (sy_call_t *)sys_mkdirat, AUE_MKDIRAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 496 = mkdirat */
{ AS(mkfifoat_args), (sy_call_t *)sys_mkfifoat, AUE_MKFIFOAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 497 = mkfifoat */
- { AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 498 = mknodat */
+ { compat11(AS(freebsd11_freebsd32_mknodat_args),freebsd32_mknodat),
AUE_MKNODAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 498 = freebsd11
freebsd32_mknodat */
{ AS(openat_args), (sy_call_t *)sys_openat, AUE_OPENAT_RWTC, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 499 = openat */
{ AS(readlinkat_args), (sy_call_t *)sys_readlinkat, AUE_READLINKAT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 500 = readlinkat */
{ AS(renameat_args), (sy_call_t *)sys_renameat, AUE_RENAMEAT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 501 = renameat */
@@ -626,4 +632,13 @@ struct sysent freebsd32_sysent[] = {
{ AS(numa_getaffinity_args), (sy_call_t *)sys_numa_getaffinity,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 548 = numa_getaffinity */
{ AS(numa_setaffinity_args), (sy_call_t *)sys_numa_setaffinity,
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 549 = numa_setaffinity */
{ AS(fdatasync_args), (sy_call_t *)sys_fdatasync, AUE_FSYNC, NULL, 0,
0, 0, SY_THR_STATIC }, /* 550 = fdatasync */
+ { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT,
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 551 = freebsd32_fstat */
+ { AS(freebsd32_fstatat_args), (sy_call_t *)freebsd32_fstatat,
AUE_FSTATAT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 552 =
freebsd32_fstatat */
+ { AS(freebsd32_fhstat_args), (sy_call_t *)freebsd32_fhstat, AUE_FHSTAT,
NULL, 0, 0, 0, SY_THR_STATIC }, /* 553 = freebsd32_fhstat */
+ { AS(freebsd32_getdirentries_args), (sy_call_t
*)freebsd32_getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 554 = freebsd32_getdirentries */
+ { AS(statfs_args), (sy_call_t *)sys_statfs, AUE_STATFS, NULL, 0, 0, 0,
SY_THR_STATIC }, /* 555 = statfs */
+ { AS(fstatfs_args), (sy_call_t *)sys_fstatfs, AUE_FSTATFS, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 556 = fstatfs */
+ { AS(getfsstat_args), (sy_call_t *)sys_getfsstat, AUE_GETFSSTAT, NULL,
0, 0, 0, SY_THR_STATIC }, /* 557 = getfsstat */
+ { AS(fhstatfs_args), (sy_call_t *)sys_fhstatfs, AUE_FHSTATFS, NULL, 0,
0, 0, SY_THR_STATIC }, /* 558 = fhstatfs */
+ { AS(mknodat_args), (sy_call_t *)sys_mknodat, AUE_MKNODAT, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 559 = mknodat */
};
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue May 23 09:29:05
2017 (r318736)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Tue May 23 09:30:42
2017 (r318737)
@@ -104,15 +104,6 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
- /* mknod */
- case 14: {
- struct mknod_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- iarg[1] = p->mode; /* int */
- iarg[2] = p->dev; /* int */
- *n_args = 3;
- break;
- }
/* chmod */
case 15: {
struct chmod_args *p = params;
@@ -914,30 +905,6 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
- /* freebsd32_stat */
- case 188: {
- struct freebsd32_stat_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- uarg[1] = (intptr_t) p->ub; /* struct stat32 * */
- *n_args = 2;
- break;
- }
- /* freebsd32_fstat */
- case 189: {
- struct freebsd32_fstat_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->ub; /* struct stat32 * */
- *n_args = 2;
- break;
- }
- /* freebsd32_lstat */
- case 190: {
- struct freebsd32_lstat_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- uarg[1] = (intptr_t) p->ub; /* struct stat32 * */
- *n_args = 2;
- break;
- }
/* pathconf */
case 191: {
struct pathconf_args *p = params;
@@ -970,16 +937,6 @@ systrace_args(int sysnum, void *params,
*n_args = 2;
break;
}
- /* freebsd32_getdirentries */
- case 196: {
- struct freebsd32_getdirentries_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->buf; /* char * */
- uarg[2] = p->count; /* u_int */
- uarg[3] = (intptr_t) p->basep; /* int32_t * */
- *n_args = 4;
- break;
- }
/* nosys */
case 198: {
*n_args = 0;
@@ -1334,15 +1291,6 @@ systrace_args(int sysnum, void *params,
*n_args = 4;
break;
}
- /* getdents */
- case 272: {
- struct getdents_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->buf; /* char * */
- uarg[2] = p->count; /* size_t */
- *n_args = 3;
- break;
- }
/* lchmod */
case 274: {
struct lchmod_args *p = params;
@@ -1377,30 +1325,6 @@ systrace_args(int sysnum, void *params,
*n_args = 3;
break;
}
- /* nstat */
- case 278: {
- struct nstat_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- uarg[1] = (intptr_t) p->ub; /* struct nstat * */
- *n_args = 2;
- break;
- }
- /* nfstat */
- case 279: {
- struct nfstat_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->sb; /* struct nstat * */
- *n_args = 2;
- break;
- }
- /* nlstat */
- case 280: {
- struct nlstat_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- uarg[1] = (intptr_t) p->ub; /* struct nstat * */
- *n_args = 2;
- break;
- }
/* freebsd32_preadv */
case 289: {
struct freebsd32_preadv_args *p = params;
@@ -1431,14 +1355,6 @@ systrace_args(int sysnum, void *params,
*n_args = 2;
break;
}
- /* fhstat */
- case 299: {
- struct fhstat_args *p = params;
- uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */
- uarg[1] = (intptr_t) p->sb; /* struct stat * */
- *n_args = 2;
- break;
- }
/* modnext */
case 300: {
struct modnext_args *p = params;
@@ -1965,39 +1881,6 @@ systrace_args(int sysnum, void *params,
*n_args = 8;
break;
}
- /* getfsstat */
- case 395: {
- struct getfsstat_args *p = params;
- uarg[0] = (intptr_t) p->buf; /* struct statfs * */
- iarg[1] = p->bufsize; /* long */
- iarg[2] = p->mode; /* int */
- *n_args = 3;
- break;
- }
- /* statfs */
- case 396: {
- struct statfs_args *p = params;
- uarg[0] = (intptr_t) p->path; /* char * */
- uarg[1] = (intptr_t) p->buf; /* struct statfs * */
- *n_args = 2;
- break;
- }
- /* fstatfs */
- case 397: {
- struct fstatfs_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->buf; /* struct statfs * */
- *n_args = 2;
- break;
- }
- /* fhstatfs */
- case 398: {
- struct fhstatfs_args *p = params;
- uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */
- uarg[1] = (intptr_t) p->buf; /* struct statfs * */
- *n_args = 2;
- break;
- }
/* ksem_close */
case 400: {
struct ksem_close_args *p = params;
@@ -2767,16 +2650,6 @@ systrace_args(int sysnum, void *params,
*n_args = 3;
break;
}
- /* freebsd32_fstatat */
- case 493: {
- struct freebsd32_fstatat_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->path; /* char * */
- uarg[2] = (intptr_t) p->buf; /* struct stat * */
- iarg[3] = p->flag; /* int */
- *n_args = 4;
- break;
- }
/* freebsd32_futimesat */
case 494: {
struct freebsd32_futimesat_args *p = params;
@@ -2815,16 +2688,6 @@ systrace_args(int sysnum, void *params,
*n_args = 3;
break;
}
- /* mknodat */
- case 498: {
- struct mknodat_args *p = params;
- iarg[0] = p->fd; /* int */
- uarg[1] = (intptr_t) p->path; /* char * */
- iarg[2] = p->mode; /* mode_t */
- iarg[3] = p->dev; /* dev_t */
- *n_args = 4;
- break;
- }
/* openat */
case 499: {
struct openat_args *p = params;
@@ -3324,6 +3187,85 @@ systrace_args(int sysnum, void *params,
*n_args = 1;
break;
}
+ /* freebsd32_fstat */
+ case 551: {
+ struct freebsd32_fstat_args *p = params;
+ iarg[0] = p->fd; /* int */
+ uarg[1] = (intptr_t) p->ub; /* struct stat32 * */
+ *n_args = 2;
+ break;
+ }
+ /* freebsd32_fstatat */
+ case 552: {
+ struct freebsd32_fstatat_args *p = params;
+ iarg[0] = p->fd; /* int */
+ uarg[1] = (intptr_t) p->path; /* char * */
+ uarg[2] = (intptr_t) p->buf; /* struct stat32 * */
+ iarg[3] = p->flag; /* int */
+ *n_args = 4;
+ break;
+ }
+ /* freebsd32_fhstat */
+ case 553: {
+ struct freebsd32_fhstat_args *p = params;
+ uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */
+ uarg[1] = (intptr_t) p->sb; /* struct stat32 * */
+ *n_args = 2;
+ break;
+ }
+ /* freebsd32_getdirentries */
+ case 554: {
+ struct freebsd32_getdirentries_args *p = params;
+ iarg[0] = p->fd; /* int */
+ uarg[1] = (intptr_t) p->buf; /* char * */
+ uarg[2] = p->count; /* size_t */
+ uarg[3] = (intptr_t) p->basep; /* int32_t * */
+ *n_args = 4;
+ break;
+ }
+ /* statfs */
+ case 555: {
+ struct statfs_args *p = params;
+ uarg[0] = (intptr_t) p->path; /* char * */
+ uarg[1] = (intptr_t) p->buf; /* struct statfs32 * */
+ *n_args = 2;
+ break;
+ }
+ /* fstatfs */
+ case 556: {
+ struct fstatfs_args *p = params;
+ iarg[0] = p->fd; /* int */
+ uarg[1] = (intptr_t) p->buf; /* struct statfs32 * */
+ *n_args = 2;
+ break;
+ }
+ /* getfsstat */
+ case 557: {
+ struct getfsstat_args *p = params;
+ uarg[0] = (intptr_t) p->buf; /* struct statfs32 * */
+ iarg[1] = p->bufsize; /* long */
+ iarg[2] = p->mode; /* int */
+ *n_args = 3;
+ break;
+ }
+ /* fhstatfs */
+ case 558: {
+ struct fhstatfs_args *p = params;
+ uarg[0] = (intptr_t) p->u_fhp; /* const struct fhandle * */
+ uarg[1] = (intptr_t) p->buf; /* struct statfs32 * */
+ *n_args = 2;
+ break;
+ }
+ /* mknodat */
+ case 559: {
+ struct mknodat_args *p = params;
+ iarg[0] = p->fd; /* int */
+ uarg[1] = (intptr_t) p->path; /* char * */
+ iarg[2] = p->mode; /* mode_t */
+ iarg[3] = p->dev; /* dev_t */
+ *n_args = 4;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -3473,22 +3415,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* mknod */
- case 14:
- switch(ndx) {
- case 0:
- p = "userland char *";
- break;
- case 1:
- p = "int";
- break;
- case 2:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* chmod */
case 15:
switch(ndx) {
@@ -4792,45 +4718,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* freebsd32_stat */
- case 188:
- switch(ndx) {
- case 0:
- p = "userland char *";
- break;
- case 1:
- p = "userland struct stat32 *";
- break;
- default:
- break;
- };
- break;
- /* freebsd32_fstat */
- case 189:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- case 1:
- p = "userland struct stat32 *";
- break;
- default:
- break;
- };
- break;
- /* freebsd32_lstat */
- case 190:
- switch(ndx) {
- case 0:
- p = "userland char *";
- break;
- case 1:
- p = "userland struct stat32 *";
- break;
- default:
- break;
- };
- break;
/* pathconf */
case 191:
switch(ndx) {
@@ -4883,25 +4770,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* freebsd32_getdirentries */
- case 196:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- case 1:
- p = "userland char *";
- break;
- case 2:
- p = "u_int";
- break;
- case 3:
- p = "userland int32_t *";
- break;
- default:
- break;
- };
- break;
/* nosys */
case 198:
break;
@@ -5435,22 +5303,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* getdents */
- case 272:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- case 1:
- p = "userland char *";
- break;
- case 2:
- p = "size_t";
- break;
- default:
- break;
- };
- break;
/* lchmod */
case 274:
switch(ndx) {
@@ -5509,78 +5361,39 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* nstat */
- case 278:
+ /* freebsd32_preadv */
+ case 289:
switch(ndx) {
case 0:
- p = "userland char *";
+ p = "int";
break;
case 1:
- p = "userland struct nstat *";
+ p = "userland struct iovec32 *";
+ break;
+ case 2:
+ p = "u_int";
+ break;
+ case 3:
+ p = "uint32_t";
+ break;
+ case 4:
+ p = "uint32_t";
break;
default:
break;
};
break;
- /* nfstat */
- case 279:
+ /* freebsd32_pwritev */
+ case 290:
switch(ndx) {
case 0:
p = "int";
break;
case 1:
- p = "userland struct nstat *";
+ p = "userland struct iovec32 *";
break;
- default:
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
