From owner-svn-src-all@freebsd.org Fri Feb 28 21:13:16 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FD92245DCC; Fri, 28 Feb 2020 21:13:16 +0000 (UTC) (envelope-from brooks@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48Tj1l5yBhz3MQy; Fri, 28 Feb 2020 21:13:15 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A92A37F49; Fri, 28 Feb 2020 21:13:15 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01SLDFBw072249; Fri, 28 Feb 2020 21:13:15 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01SLDFah072248; Fri, 28 Feb 2020 21:13:15 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202002282113.01SLDFah072248@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 28 Feb 2020 21:13:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358449 - head/sys/sys X-SVN-Group: head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/sys/sys X-SVN-Commit-Revision: 358449 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Feb 2020 21:13:16 -0000 Author: brooks Date: Fri Feb 28 21:13:15 2020 New Revision: 358449 URL: https://svnweb.freebsd.org/changeset/base/358449 Log: Define SCTL_MASK32 when COMPAT_FREEBSD32 is defined. Remove the list of architectures and depend on COMPAT_FREEBSD32 which is defined (if relevent) in opt_global.h and thus defined everywhere in the kernel. This is a minor change in behavior in that 32-bit compat for sysctls now depends on COMPAT_FREEBSD32 rather than on the potential for 32-bit compat support. The prior arrangement may have been part of an attempt to allow 32-bit compat to be loadable, but such attempts are doomed to failure (due to the fact that ioctls have no meaning without the associated file descriptor) without vastly more refactoring and some sort of COMPAT_FREEBSD32_SUPPORT option. Reviewed by: jhb Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D23748 Modified: head/sys/sys/sysctl.h Modified: head/sys/sys/sysctl.h ============================================================================== --- head/sys/sys/sysctl.h Fri Feb 28 20:43:35 2020 (r358448) +++ head/sys/sys/sysctl.h Fri Feb 28 21:13:15 2020 (r358449) @@ -156,8 +156,7 @@ struct ctlname { #define REQ_WIRED 2 /* definitions for sysctl_req 'flags' member */ -#if defined(__aarch64__) || defined(__amd64__) || defined(__powerpc64__) ||\ - (defined(__mips__) && defined(__mips_n64)) +#ifdef COMPAT_FREEBSD32 #define SCTL_MASK32 1 /* 32 bit emulation */ #endif