Regen after r362440.

MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation

5 files changed, 14 insertions, 7 deletions

diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index ab56bd70ecf1..670c14ea4f60 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -854,6 +854,11 @@ struct linux_mincore_args {
 	char len_l_[PADL_(l_size_t)]; l_size_t len; char len_r_[PADR_(l_size_t)];
 	char vec_l_[PADL_(u_char *)]; u_char * vec; char vec_r_[PADR_(u_char *)];
 };
+struct linux_madvise_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)];
+	char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)];
+};
 struct linux_remap_file_pages_args {
 	register_t dummy;
 };
@@ -1240,6 +1245,7 @@ int	linux_swapoff(struct thread *, struct linux_swapoff_args *);
 int	linux_mprotect(struct thread *, struct linux_mprotect_args *);
 int	linux_msync(struct thread *, struct linux_msync_args *);
 int	linux_mincore(struct thread *, struct linux_mincore_args *);
+int	linux_madvise(struct thread *, struct linux_madvise_args *);
 int	linux_remap_file_pages(struct thread *, struct linux_remap_file_pages_args *);
 int	linux_mbind(struct thread *, struct linux_mbind_args *);
 int	linux_get_mempolicy(struct thread *, struct linux_get_mempolicy_args *);
@@ -1514,6 +1520,7 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX_SYS_AUE_linux_mprotect	AUE_MPROTECT
 #define	LINUX_SYS_AUE_linux_msync	AUE_MSYNC
 #define	LINUX_SYS_AUE_linux_mincore	AUE_MINCORE
+#define	LINUX_SYS_AUE_linux_madvise	AUE_MADVISE
 #define	LINUX_SYS_AUE_linux_remap_file_pages	AUE_NULL
 #define	LINUX_SYS_AUE_linux_mbind	AUE_NULL
 #define	LINUX_SYS_AUE_linux_get_mempolicy	AUE_NULL
diff --git a/sys/arm64/linux/linux_syscall.h b/sys/arm64/linux/linux_syscall.h
index fd6a8ca6418c..975229304af6 100644
--- a/sys/arm64/linux/linux_syscall.h
+++ b/sys/arm64/linux/linux_syscall.h
@@ -227,7 +227,7 @@
 #define	LINUX_SYS_mlockall	230
 #define	LINUX_SYS_munlockall	231
 #define	LINUX_SYS_linux_mincore	232
-#define	LINUX_SYS_madvise	233
+#define	LINUX_SYS_linux_madvise	233
 #define	LINUX_SYS_linux_remap_file_pages	234
 #define	LINUX_SYS_linux_mbind	235
 #define	LINUX_SYS_linux_get_mempolicy	236
diff --git a/sys/arm64/linux/linux_syscalls.c b/sys/arm64/linux/linux_syscalls.c
index 23489169a785..9ce335174db8 100644
--- a/sys/arm64/linux/linux_syscalls.c
+++ b/sys/arm64/linux/linux_syscalls.c
@@ -240,7 +240,7 @@ const char *linux_syscallnames[] = {
 	"mlockall",			/* 230 = mlockall */
 	"munlockall",			/* 231 = munlockall */
 	"linux_mincore",			/* 232 = linux_mincore */
-	"madvise",			/* 233 = madvise */
+	"linux_madvise",			/* 233 = linux_madvise */
 	"linux_remap_file_pages",			/* 234 = linux_remap_file_pages */
 	"linux_mbind",			/* 235 = linux_mbind */
 	"linux_get_mempolicy",			/* 236 = linux_get_mempolicy */
diff --git a/sys/arm64/linux/linux_sysent.c b/sys/arm64/linux/linux_sysent.c
index f8475fe3da44..c8d5122cffbd 100644
--- a/sys/arm64/linux/linux_sysent.c
+++ b/sys/arm64/linux/linux_sysent.c
@@ -250,7 +250,7 @@ struct sysent linux_sysent[] = {
 	{ AS(mlockall_args), (sy_call_t *)sys_mlockall, AUE_MLOCKALL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 230 = mlockall */
 	{ 0, (sy_call_t *)sys_munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 231 = munlockall */
 	{ AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 232 = linux_mincore */
-	{ AS(madvise_args), (sy_call_t *)sys_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 233 = madvise */
+	{ AS(linux_madvise_args), (sy_call_t *)linux_madvise, AUE_MADVISE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 233 = linux_madvise */
 	{ 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 234 = linux_remap_file_pages */
 	{ 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 235 = linux_mbind */
 	{ 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 236 = linux_get_mempolicy */
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index f13ceb96008f..193f84e88a4e 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -1766,9 +1766,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* madvise */
+	/* linux_madvise */
 	case 233: {
-		struct madvise_args *p = params;
+		struct linux_madvise_args *p = params;
 		uarg[0] = (intptr_t) p->addr; /* void * */
 		uarg[1] = p->len; /* size_t */
 		iarg[2] = p->behav; /* int */
@@ -4898,7 +4898,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* madvise */
+	/* linux_madvise */
 	case 233:
 		switch(ndx) {
 		case 0:
@@ -6449,7 +6449,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* madvise */
+	/* linux_madvise */
 	case 233:
 		if (ndx == 0 || ndx == 1)
 			p = "int";