git: d8bd949bebb3 - main - sys___sysctl: regularize argument struct

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=d8bd949bebb3a6c46e42cb9666bc10cee1389892

commit d8bd949bebb3a6c46e42cb9666bc10cee1389892
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-22 22:36:54 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-22 22:36:54 +0000

    sys___sysctl: regularize argument struct
    
    Let makesyscalls generate the normal struct __sysctl_args structure.
    It works fine.
    
    Reviewed by:    kib
---
 sys/kern/kern_sysctl.c   | 4 ++--
 sys/kern/syscalls.master | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index c472db18aac7..3d55a0e65883 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -2310,7 +2310,7 @@ out:
 }
 
 #ifndef _SYS_SYSPROTO_H_
-struct sysctl_args {
+struct __sysctl_args {
 	int	*name;
 	u_int	namelen;
 	void	*old;
@@ -2320,7 +2320,7 @@ struct sysctl_args {
 };
 #endif
 int
-sys___sysctl(struct thread *td, struct sysctl_args *uap)
+sys___sysctl(struct thread *td, struct __sysctl_args *uap)
 {
 	int error, i, name[CTL_MAXNAME];
 	size_t j;
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index a12e9121811e..5f4890f422df 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1198,7 +1198,7 @@
 		    _In_reads_bytes_opt_(newlen) const void *new,
 		    size_t newlen
 		);
-	} __sysctl sysctl_args int
+	}
 203	AUE_MLOCK	STD|CAPENABLED {
 		int mlock(
 		    _In_ const void *addr,