Index: head/sys/arm/conf/GENERIC-NODEBUG
===================================================================
--- head/sys/arm/conf/GENERIC-NODEBUG	(revision 334648)
+++ head/sys/arm/conf/GENERIC-NODEBUG	(revision 334649)
@@ -1,40 +1,38 @@
 #
 # GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file 
 #		     for FreeBSD/arm
 #
 # This configuration file removes several debugging options, including
 # WITNESS and INVARIANTS checking, which are known to have significant
 # performance impact on running systems.  When benchmarking new features
 # this kernel should be used instead of the standard GENERIC.
 # This kernel configuration should never appear outside of the HEAD
 # of the FreeBSD tree.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 include GENERIC
 
 ident   GENERIC-NODEBUG
 
 nooptions       INVARIANTS
 nooptions       INVARIANT_SUPPORT
 nooptions       WITNESS
 nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
 nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
 
Index: head/sys/arm64/conf/GENERIC-NODEBUG
===================================================================
--- head/sys/arm64/conf/GENERIC-NODEBUG	(revision 334648)
+++ head/sys/arm64/conf/GENERIC-NODEBUG	(revision 334649)
@@ -1,40 +1,38 @@
 #
 # GENERIC-NODEBUG -- WITNESS and INVARIANTS free kernel configuration file 
 #		     for FreeBSD/arm64
 #
 # This configuration file removes several debugging options, including
 # WITNESS and INVARIANTS checking, which are known to have significant
 # performance impact on running systems.  When benchmarking new features
 # this kernel should be used instead of the standard GENERIC.
 # This kernel configuration should never appear outside of the HEAD
 # of the FreeBSD tree.
 #
 # For more information on this file, please read the config(5) manual page,
 # and/or the handbook section on Kernel Configuration Files:
 #
 #    https://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
 # The handbook is also available locally in /usr/share/doc/handbook
 # if you've installed the doc distribution, otherwise always see the
 # FreeBSD World Wide Web server (https://www.FreeBSD.org/) for the
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
 # device lines is also present in the ../../conf/NOTES and NOTES files.
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 include GENERIC
 
 ident   GENERIC-NODEBUG
 
 nooptions       INVARIANTS
 nooptions       INVARIANT_SUPPORT
 nooptions       WITNESS
 nooptions       WITNESS_SKIPSPIN
-nooptions       BUF_TRACKING
 nooptions       DEADLKRES
-nooptions       FULL_BUF_TRACKING
 nooptions       USB_DEBUG