svn commit: r340273 - head/sys/compat/freebsd32

Brooks Davis brooks at FreeBSD.org
Fri Nov 9 00:22:48 UTC 2018


Author: brooks
Date: Fri Nov  9 00:22:45 2018
New Revision: 340273
URL: https://svnweb.freebsd.org/changeset/base/340273

Log:
  Regen after 340272: Make __sysctl follow the freebsd32_foo convention
  
  Sponsored by:	DARPA, AFRL

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

Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h	Fri Nov  9 00:21:58 2018	(r340272)
+++ head/sys/compat/freebsd32/freebsd32_proto.h	Fri Nov  9 00:22:45 2018	(r340273)
@@ -162,7 +162,7 @@ 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_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 *)];
@@ -736,7 +736,7 @@ int	freebsd32_sysarch(struct thread *, struct freebsd3
 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_sysctl(struct thread *, struct freebsd32_sysctl_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 *);
 int	freebsd32_msgrcv(struct thread *, struct freebsd32_msgrcv_args *);
@@ -1282,7 +1282,7 @@ int	freebsd11_freebsd32_mknodat(struct thread *, struc
 #define	FREEBSD32_SYS_AUE_freebsd6_freebsd32_lseek	AUE_LSEEK
 #define	FREEBSD32_SYS_AUE_freebsd6_freebsd32_truncate	AUE_TRUNCATE
 #define	FREEBSD32_SYS_AUE_freebsd6_freebsd32_ftruncate	AUE_FTRUNCATE
-#define	FREEBSD32_SYS_AUE_freebsd32_sysctl	AUE_SYSCTL
+#define	FREEBSD32_SYS_AUE_freebsd32___sysctl	AUE_SYSCTL
 #define	FREEBSD32_SYS_AUE_freebsd32_futimes	AUE_FUTIMES
 #define	FREEBSD32_SYS_AUE_freebsd7_freebsd32_semctl	AUE_SEMCTL
 #define	FREEBSD32_SYS_AUE_freebsd7_freebsd32_msgctl	AUE_MSGCTL

Modified: head/sys/compat/freebsd32/freebsd32_syscall.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscall.h	Fri Nov  9 00:21:58 2018	(r340272)
+++ head/sys/compat/freebsd32/freebsd32_syscall.h	Fri Nov  9 00:22:45 2018	(r340273)
@@ -188,7 +188,7 @@
 				/* 199 is freebsd6 freebsd32_lseek */
 				/* 200 is freebsd6 freebsd32_truncate */
 				/* 201 is freebsd6 freebsd32_ftruncate */
-#define	FREEBSD32_SYS_freebsd32_sysctl	202
+#define	FREEBSD32_SYS_freebsd32___sysctl	202
 #define	FREEBSD32_SYS_mlock	203
 #define	FREEBSD32_SYS_munlock	204
 #define	FREEBSD32_SYS_undelete	205

Modified: head/sys/compat/freebsd32/freebsd32_syscalls.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_syscalls.c	Fri Nov  9 00:21:58 2018	(r340272)
+++ head/sys/compat/freebsd32/freebsd32_syscalls.c	Fri Nov  9 00:22:45 2018	(r340273)
@@ -211,7 +211,7 @@ const char *freebsd32_syscallnames[] = {
 	"compat6.freebsd32_lseek",		/* 199 = freebsd6 freebsd32_lseek */
 	"compat6.freebsd32_truncate",		/* 200 = freebsd6 freebsd32_truncate */
 	"compat6.freebsd32_ftruncate",		/* 201 = freebsd6 freebsd32_ftruncate */
-	"freebsd32_sysctl",			/* 202 = freebsd32_sysctl */
+	"freebsd32___sysctl",			/* 202 = freebsd32___sysctl */
 	"mlock",			/* 203 = mlock */
 	"munlock",			/* 204 = munlock */
 	"undelete",			/* 205 = undelete */

Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c	Fri Nov  9 00:21:58 2018	(r340272)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c	Fri Nov  9 00:22:45 2018	(r340273)
@@ -258,7 +258,7 @@ struct sysent freebsd32_sysent[] = {
 	{ compat6(AS(freebsd6_freebsd32_lseek_args),freebsd32_lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 199 = freebsd6 freebsd32_lseek */
 	{ compat6(AS(freebsd6_freebsd32_truncate_args),freebsd32_truncate), AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 200 = freebsd6 freebsd32_truncate */
 	{ compat6(AS(freebsd6_freebsd32_ftruncate_args),freebsd32_ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 201 = freebsd6 freebsd32_ftruncate */
-	{ AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 202 = freebsd32_sysctl */
+	{ AS(freebsd32___sysctl_args), (sy_call_t *)freebsd32___sysctl, AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 202 = freebsd32___sysctl */
 	{ AS(mlock_args), (sy_call_t *)sys_mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 203 = mlock */
 	{ AS(munlock_args), (sy_call_t *)sys_munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },	/* 204 = munlock */
 	{ AS(undelete_args), (sy_call_t *)sys_undelete, AUE_UNDELETE, NULL, 0, 0, 0, SY_THR_STATIC },	/* 205 = undelete */

Modified: head/sys/compat/freebsd32/freebsd32_systrace_args.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_systrace_args.c	Fri Nov  9 00:21:58 2018	(r340272)
+++ head/sys/compat/freebsd32/freebsd32_systrace_args.c	Fri Nov  9 00:22:45 2018	(r340273)
@@ -935,9 +935,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 0;
 		break;
 	}
-	/* freebsd32_sysctl */
+	/* freebsd32___sysctl */
 	case 202: {
-		struct freebsd32_sysctl_args *p = params;
+		struct freebsd32___sysctl_args *p = params;
 		uarg[0] = (intptr_t) p->name; /* int * */
 		uarg[1] = p->namelen; /* u_int */
 		uarg[2] = (intptr_t) p->old; /* void * */
@@ -4755,7 +4755,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 	/* nosys */
 	case 198:
 		break;
-	/* freebsd32_sysctl */
+	/* freebsd32___sysctl */
 	case 202:
 		switch(ndx) {
 		case 0:
@@ -9305,7 +9305,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* nosys */
 	case 198:
-	/* freebsd32_sysctl */
+	/* freebsd32___sysctl */
 	case 202:
 		if (ndx == 0 || ndx == 1)
 			p = "int";


More information about the svn-src-head mailing list