git: b620daf63309 - main - x86 NOTES: Move NKPT and PMAP_SHPGPERPROC options to VM OPTIONS section

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=b620daf63309f655546caa060ea79cb230e4c9bc

commit b620daf63309f655546caa060ea79cb230e4c9bc
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-14 02:11:21 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-04-14 02:11:21 +0000

    x86 NOTES: Move NKPT and PMAP_SHPGPERPROC options to VM OPTIONS section
    
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D44785
---
 sys/amd64/conf/NOTES | 16 ++++++++--------
 sys/i386/conf/NOTES  | 32 ++++++++++++++++----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index c99aae19f10e..49d2bec91364 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -554,14 +554,6 @@ options 	ENABLE_ALART		# Control alarm on Intel intpm driver
 #
 device		amdsmn
 
-#
-# Number of initial kernel page table pages used for early bootstrap.
-# This number should include enough pages to map the kernel and any
-# modules or other data loaded with the kernel by the loader.  Each
-# page table page maps 2MB.
-#
-options 	NKPT=31
-
 # EFI Runtime Services support
 options 	EFIRT
 
@@ -596,6 +588,14 @@ options 	ZFS
 #####################################################################
 # VM OPTIONS
 
+#
+# Number of initial kernel page table pages used for early bootstrap.
+# This number should include enough pages to map the kernel and any
+# modules or other data loaded with the kernel by the loader.  Each
+# page table page maps 2MB.
+#
+options 	NKPT=31
+
 # KSTACK_PAGES is the number of memory pages to assign to the kernel
 # stack of each thread.
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index dc3107349711..8f6098301b12 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -764,6 +764,22 @@ device		superio
 #
 options 	ENABLE_ALART		# Control alarm on Intel intpm driver
 
+#
+# HID-over-I2C support
+#
+device		iichid		# HID-over-I2C support
+options 	IICHID_DEBUG	# Enable HID-over-I2C debug messages
+options 	IICHID_SAMPLING	# Workaround missing GPIO INTR support
+
+#####################################################################
+# ABI Emulation
+
+# Enable (32-bit) a.out binary support
+options 	COMPAT_AOUT
+
+#####################################################################
+# VM OPTIONS
+
 #
 # Set the number of PV entries per process.  Increasing this can
 # stop panics related to heavy use of shared memory.  However, that can
@@ -786,22 +802,6 @@ options 	PMAP_SHPGPERPROC=201
 #
 options 	NKPT=31
 
-#
-# HID-over-I2C support
-#
-device		iichid		# HID-over-I2C support
-options 	IICHID_DEBUG	# Enable HID-over-I2C debug messages
-options 	IICHID_SAMPLING	# Workaround missing GPIO INTR support
-
-#####################################################################
-# ABI Emulation
-
-# Enable (32-bit) a.out binary support
-options 	COMPAT_AOUT
-
-#####################################################################
-# VM OPTIONS
-
 # KSTACK_PAGES is the number of memory pages to assign to the kernel
 # stack of each thread.