Author: brooks
Date: Fri May 25 20:41:26 2018
New Revision: 334224
URL: https://svnweb.freebsd.org/changeset/base/334224
Log:
Regen after r334223: make vadvise compat freebsd11.
Modified:
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_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h Fri May 25 20:40:23
2018 (r334223)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h Fri May 25 20:41:26
2018 (r334224)
@@ -77,7 +77,7 @@
#define FREEBSD32_SYS_sbrk 69
#define FREEBSD32_SYS_sstk 70
/* 71 is old mmap */
-#define FREEBSD32_SYS_vadvise 72
+#define FREEBSD32_SYS_freebsd11_vadvise 72
#define FREEBSD32_SYS_munmap 73
#define FREEBSD32_SYS_freebsd32_mprotect 74
#define FREEBSD32_SYS_madvise 75
Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c Fri May 25 20:40:23
2018 (r334223)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c Fri May 25 20:41:26
2018 (r334224)
@@ -81,7 +81,7 @@ const char *freebsd32_syscallnames[] = {
"sbrk", /* 69 = sbrk */
"sstk", /* 70 = sstk */
"compat.mmap", /* 71 = old mmap */
- "vadvise", /* 72 = vadvise */
+ "compat11.vadvise", /* 72 = freebsd11 vadvise */
"munmap", /* 73 = munmap */
"freebsd32_mprotect", /* 74 = freebsd32_mprotect */
"madvise", /* 75 = madvise */
Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c Fri May 25 20:40:23
2018 (r334223)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c Fri May 25 20:41:26
2018 (r334224)
@@ -128,7 +128,7 @@ struct sysent freebsd32_sysent[] = {
{ AS(sbrk_args), (sy_call_t *)sys_sbrk, AUE_SBRK, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 69 = sbrk */
{ AS(sstk_args), (sy_call_t *)sys_sstk, AUE_SSTK, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 70 = sstk */
{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0, SY_THR_STATIC
}, /* 71 = old mmap */
- { AS(ovadvise_args), (sy_call_t *)sys_ovadvise, AUE_O_VADVISE, NULL, 0,
0, 0, SY_THR_STATIC }, /* 72 = vadvise */
+ { compat11(AS(freebsd11_vadvise_args),vadvise), AUE_O_VADVISE, NULL, 0,
0, 0, SY_THR_STATIC }, /* 72 = freebsd11 vadvise */
{ AS(munmap_args), (sy_call_t *)sys_munmap, AUE_MUNMAP, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 73 = munmap */
{ AS(freebsd32_mprotect_args), (sy_call_t *)freebsd32_mprotect,
AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 74 =
freebsd32_mprotect */
{ AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 75 = madvise */
Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri May 25 20:40:23
2018 (r334223)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c Fri May 25 20:41:26
2018 (r334224)
@@ -435,13 +435,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 1;
break;
}
- /* ovadvise */
- case 72: {
- struct ovadvise_args *p = params;
- iarg[0] = p->anom; /* int */
- *n_args = 1;
- break;
- }
/* munmap */
case 73: {
struct munmap_args *p = params;
@@ -3944,16 +3937,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* ovadvise */
- case 72:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* munmap */
case 73:
switch(ndx) {
@@ -9081,11 +9064,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
break;
/* sstk */
case 70:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
- /* ovadvise */
- case 72:
if (ndx == 0 || ndx == 1)
p = "int";
break;
Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c Fri May 25 20:40:23 2018 (r334223)
+++ head/sys/kern/init_sysent.c Fri May 25 20:41:26 2018 (r334224)
@@ -121,7 +121,7 @@ struct sysent sysent[] = {
{ AS(sbrk_args), (sy_call_t *)sys_sbrk, AUE_SBRK, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 69 = sbrk */
{ AS(sstk_args), (sy_call_t *)sys_sstk, AUE_SSTK, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 70 = sstk */
{ compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED,
SY_THR_STATIC }, /* 71 = old mmap */
- { AS(ovadvise_args), (sy_call_t *)sys_ovadvise, AUE_O_VADVISE, NULL, 0,
0, 0, SY_THR_STATIC }, /* 72 = vadvise */
+ { compat11(AS(freebsd11_vadvise_args),vadvise), AUE_O_VADVISE, NULL, 0,
0, 0, SY_THR_STATIC }, /* 72 = freebsd11 vadvise */
{ AS(munmap_args), (sy_call_t *)sys_munmap, AUE_MUNMAP, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 73 = munmap */
{ AS(mprotect_args), (sy_call_t *)sys_mprotect, AUE_MPROTECT, NULL, 0,
0, SYF_CAPENABLED, SY_THR_STATIC }, /* 74 = mprotect */
{ AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0,
SYF_CAPENABLED, SY_THR_STATIC }, /* 75 = madvise */
Modified: head/sys/kern/syscalls.c
==============================================================================
--- head/sys/kern/syscalls.c Fri May 25 20:40:23 2018 (r334223)
+++ head/sys/kern/syscalls.c Fri May 25 20:41:26 2018 (r334224)
@@ -78,7 +78,7 @@ const char *syscallnames[] = {
"sbrk", /* 69 = sbrk */
"sstk", /* 70 = sstk */
"compat.mmap", /* 71 = old mmap */
- "vadvise", /* 72 = vadvise */
+ "compat11.vadvise", /* 72 = freebsd11 vadvise */
"munmap", /* 73 = munmap */
"mprotect", /* 74 = mprotect */
"madvise", /* 75 = madvise */
Modified: head/sys/kern/systrace_args.c
==============================================================================
--- head/sys/kern/systrace_args.c Fri May 25 20:40:23 2018
(r334223)
+++ head/sys/kern/systrace_args.c Fri May 25 20:41:26 2018
(r334224)
@@ -432,13 +432,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
*n_args = 1;
break;
}
- /* ovadvise */
- case 72: {
- struct ovadvise_args *p = params;
- iarg[0] = p->anom; /* int */
- *n_args = 1;
- break;
- }
/* munmap */
case 73: {
struct munmap_args *p = params;
@@ -3949,16 +3942,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
};
break;
- /* ovadvise */
- case 72:
- switch(ndx) {
- case 0:
- p = "int";
- break;
- default:
- break;
- };
- break;
/* munmap */
case 73:
switch(ndx) {
@@ -9030,11 +9013,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
break;
/* sstk */
case 70:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
- /* ovadvise */
- case 72:
if (ndx == 0 || ndx == 1)
p = "int";
break;
Modified: head/sys/sys/syscall.h
==============================================================================
--- head/sys/sys/syscall.h Fri May 25 20:40:23 2018 (r334223)
+++ head/sys/sys/syscall.h Fri May 25 20:41:26 2018 (r334224)
@@ -77,7 +77,7 @@
#define SYS_sbrk 69
#define SYS_sstk 70
/* 71 is old mmap */
-#define SYS_vadvise 72
+#define SYS_freebsd11_vadvise 72
#define SYS_munmap 73
#define SYS_mprotect 74
#define SYS_madvise 75
Modified: head/sys/sys/syscall.mk
==============================================================================
--- head/sys/sys/syscall.mk Fri May 25 20:40:23 2018 (r334223)
+++ head/sys/sys/syscall.mk Fri May 25 20:41:26 2018 (r334224)
@@ -59,7 +59,7 @@ MIASM = \
vfork.o \
sbrk.o \
sstk.o \
- vadvise.o \
+ freebsd11_vadvise.o \
munmap.o \
mprotect.o \
madvise.o \
Modified: head/sys/sys/sysproto.h
==============================================================================
--- head/sys/sys/sysproto.h Fri May 25 20:40:23 2018 (r334223)
+++ head/sys/sys/sysproto.h Fri May 25 20:41:26 2018 (r334224)
@@ -264,9 +264,6 @@ struct sbrk_args {
struct sstk_args {
char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)];
};
-struct ovadvise_args {
- char anom_l_[PADL_(int)]; int anom; char anom_r_[PADR_(int)];
-};
struct munmap_args {
char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
@@ -1828,7 +1825,6 @@ int sys_msync(struct thread *, struct msync_args *);
int sys_vfork(struct thread *, struct vfork_args *);
int sys_sbrk(struct thread *, struct sbrk_args *);
int sys_sstk(struct thread *, struct sstk_args *);
-int sys_ovadvise(struct thread *, struct ovadvise_args *);
int sys_munmap(struct thread *, struct munmap_args *);
int sys_mprotect(struct thread *, struct mprotect_args *);
int sys_madvise(struct thread *, struct madvise_args *);
@@ -2493,6 +2489,9 @@ struct freebsd11_mknod_args {
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_vadvise_args {
+ char anom_l_[PADL_(int)]; int anom; char anom_r_[PADR_(int)];
+};
struct freebsd11_stat_args {
char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
char ub_l_[PADL_(struct freebsd11_stat *)]; struct freebsd11_stat * ub;
char ub_r_[PADR_(struct freebsd11_stat *)];
@@ -2570,6 +2569,7 @@ struct freebsd11_mknodat_args {
char dev_l_[PADL_(uint32_t)]; uint32_t dev; char
dev_r_[PADR_(uint32_t)];
};
int freebsd11_mknod(struct thread *, struct freebsd11_mknod_args *);
+int freebsd11_vadvise(struct thread *, struct freebsd11_vadvise_args *);
int freebsd11_stat(struct thread *, struct freebsd11_stat_args *);
int freebsd11_fstat(struct thread *, struct freebsd11_fstat_args *);
int freebsd11_lstat(struct thread *, struct freebsd11_lstat_args *);
@@ -2658,7 +2658,7 @@ int freebsd11_mknodat(struct thread *, struct
freebsd1
#define SYS_AUE_sbrk AUE_SBRK
#define SYS_AUE_sstk AUE_SSTK
#define SYS_AUE_ommap AUE_MMAP
-#define SYS_AUE_vadvise AUE_O_VADVISE
+#define SYS_AUE_freebsd11_vadvise AUE_O_VADVISE
#define SYS_AUE_munmap AUE_MUNMAP
#define SYS_AUE_mprotect AUE_MPROTECT
#define SYS_AUE_madvise AUE_MADVISE
_______________________________________________
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"
