The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=9df4e7e2e90fc48b6f09eec5b92e63451a9cba26
commit 9df4e7e2e90fc48b6f09eec5b92e63451a9cba26
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-15 18:34:28 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-15 18:34:28 +0000
syscalls: regen
---
sys/compat/freebsd32/freebsd32_proto.h | 10 ++++++++++
sys/compat/freebsd32/freebsd32_syscall.h | 2 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 2 +-
sys/compat/freebsd32/freebsd32_sysent.c | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index 7a259a84a221..2ddd5f472ccf 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -936,6 +936,14 @@ struct ofreebsd32_fstat_args {
struct ofreebsd32_getpagesize_args {
char dummy_l_[PADL_(int32_t)]; int32_t dummy; char
dummy_r_[PADR_(int32_t)];
};
+struct ofreebsd32_mmap_args {
+ char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
+ char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
+ char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
+ char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
+ char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
+ char pos_l_[PADL_(int32_t)]; int32_t pos; char pos_r_[PADR_(int32_t)];
+};
struct ofreebsd32_sigreturn_args {
char sigcntxp_l_[PADL_(struct ia32_sigcontext3 *)]; struct
ia32_sigcontext3 * sigcntxp; char sigcntxp_r_[PADR_(struct ia32_sigcontext3 *)];
};
@@ -986,6 +994,7 @@ int ofreebsd32_sigprocmask(struct thread *, struct
ofreebsd32_sigprocmask_args *
int ofreebsd32_sigpending(struct thread *, struct
ofreebsd32_sigpending_args *);
int ofreebsd32_fstat(struct thread *, struct ofreebsd32_fstat_args *);
int ofreebsd32_getpagesize(struct thread *, struct
ofreebsd32_getpagesize_args *);
+int ofreebsd32_mmap(struct thread *, struct ofreebsd32_mmap_args *);
int ofreebsd32_sigreturn(struct thread *, struct ofreebsd32_sigreturn_args
*);
int ofreebsd32_sigvec(struct thread *, struct ofreebsd32_sigvec_args *);
int ofreebsd32_sigblock(struct thread *, struct ofreebsd32_sigblock_args *);
@@ -1343,6 +1352,7 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE
#define FREEBSD32_SYS_AUE_ofreebsd32_fstat AUE_FSTAT
#define FREEBSD32_SYS_AUE_ofreebsd32_getpagesize AUE_NULL
+#define FREEBSD32_SYS_AUE_ofreebsd32_mmap AUE_MMAP
#define FREEBSD32_SYS_AUE_freebsd32_mprotect AUE_MPROTECT
#define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER
#define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index 9f2f439c4c7f..124e8b0e05e7 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -76,7 +76,7 @@
/* 68 is obsolete vwrite */
#define FREEBSD32_SYS_sbrk 69
#define FREEBSD32_SYS_sstk 70
- /* 71 is old mmap */
+ /* 71 is old freebsd32_mmap */
#define FREEBSD32_SYS_freebsd11_vadvise 72
#define FREEBSD32_SYS_munmap 73
#define FREEBSD32_SYS_freebsd32_mprotect 74
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index 4d20af028834..f0ae365ddf3d 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -80,7 +80,7 @@ const char *freebsd32_syscallnames[] = {
"obs_vwrite", /* 68 = obsolete vwrite */
"sbrk", /* 69 = sbrk */
"sstk", /* 70 = sstk */
- "compat.mmap", /* 71 = old mmap */
+ "compat.freebsd32_mmap", /* 71 = old freebsd32_mmap */
"compat11.vadvise", /* 72 = freebsd11 vadvise */
"munmap", /* 73 = munmap */
"freebsd32_mprotect", /* 74 = freebsd32_mprotect */
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index f8769b8de446..c48e7b1f3c9a 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -133,7 +133,7 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 68 =
obsolete vwrite */
{ .sy_narg = AS(sbrk_args), .sy_call = (sy_call_t *)sys_sbrk,
.sy_auevent = AUE_SBRK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC
}, /* 69 = sbrk */
{ .sy_narg = AS(sstk_args), .sy_call = (sy_call_t *)sys_sstk,
.sy_auevent = AUE_SSTK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC
}, /* 70 = sstk */
- { compat(AS(ommap_args),mmap), .sy_auevent = AUE_MMAP, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 71 = old mmap */
+ { compat(AS(ofreebsd32_mmap_args),freebsd32_mmap), .sy_auevent =
AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 71 =
old freebsd32_mmap */
{ compat11(AS(freebsd11_vadvise_args),vadvise), .sy_auevent =
AUE_O_VADVISE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 72 =
freebsd11 vadvise */
{ .sy_narg = AS(munmap_args), .sy_call = (sy_call_t *)sys_munmap,
.sy_auevent = AUE_MUNMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 73 = munmap */
{ .sy_narg = AS(freebsd32_mprotect_args), .sy_call = (sy_call_t
*)freebsd32_mprotect, .sy_auevent = AUE_MPROTECT, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 74 = freebsd32_mprotect */
