svn commit: r358449 - head/sys/sys

[Brooks Davis]

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