From nobody Wed Nov 17 20:22:31 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 46CB41855066; Wed, 17 Nov 2021 20:22:37 +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 4HvZ9R36YXz4qv7; Wed, 17 Nov 2021 20:22:35 +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 EDF5727373; Wed, 17 Nov 2021 20:22:31 +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 1AHKMVC4059841; Wed, 17 Nov 2021 20:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AHKMVYW059840; Wed, 17 Nov 2021 20:22:31 GMT (envelope-from git) Date: Wed, 17 Nov 2021 20:22:31 GMT Message-Id: <202111172022.1AHKMVYW059840@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: 5b5a48c787b8 - main - freebsd32: simplify memrange translation 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: 5b5a48c787b8a4655e9782bd8ac392a79aeae1a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=5b5a48c787b8a4655e9782bd8ac392a79aeae1a6 commit 5b5a48c787b8a4655e9782bd8ac392a79aeae1a6 Author: Brooks Davis AuthorDate: 2021-11-17 20:12:24 +0000 Commit: Brooks Davis CommitDate: 2021-11-17 20:12:24 +0000 freebsd32: simplify memrange translation Assume we've been passed a valid argument and use _IOC_NEWTYPE to translate the command as we do elsewhere. Reviewed by: kevans --- sys/compat/freebsd32/freebsd32_ioctl.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_ioctl.c b/sys/compat/freebsd32/freebsd32_ioctl.c index 4818a410586a..957c546d4daf 100644 --- a/sys/compat/freebsd32/freebsd32_ioctl.c +++ b/sys/compat/freebsd32/freebsd32_ioctl.c @@ -74,19 +74,7 @@ freebsd32_ioctl_memrange(struct thread *td, CP(mro32, mro, mo_arg[0]); CP(mro32, mro, mo_arg[1]); - com = 0; - switch (uap->com) { - case MEMRANGE_GET32: - com = MEMRANGE_GET; - break; - - case MEMRANGE_SET32: - com = MEMRANGE_SET; - break; - - default: - panic("%s: unknown MEMRANGE %#lx", __func__, uap->com); - } + com = _IOC_NEWTYPE(uap->com, struct mem_range_op); if ((error = fo_ioctl(fp, com, (caddr_t)&mro, td->td_ucred, td)) != 0) return (error);