From nobody Mon Nov 22 22:37:20 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2984B1892320; Mon, 22 Nov 2021 22:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hyhwd01zrz4Xfb; Mon, 22 Nov 2021 22:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C5B4C2EEE; Mon, 22 Nov 2021 22:37:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AMMbKbS046635; Mon, 22 Nov 2021 22:37:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMMbK5Y046634; Mon, 22 Nov 2021 22:37:20 GMT (envelope-from git) Date: Mon, 22 Nov 2021 22:37:20 GMT Message-Id: <202111222237.1AMMbK5Y046634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: d8bd949bebb3 - main - sys___sysctl: regularize argument struct List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8bd949bebb3a6c46e42cb9666bc10cee1389892 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d8bd949bebb3a6c46e42cb9666bc10cee1389892 commit d8bd949bebb3a6c46e42cb9666bc10cee1389892 Author: Brooks Davis AuthorDate: 2021-11-22 22:36:54 +0000 Commit: Brooks Davis 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,