From 26086a0366117611f034fdda088457ce3447bf88 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 27 Feb 2001 07:39:12 +0000
Subject: [PATCH] "Document" the COMPAT_LINUX and IBCS2 ABI emulation support
 together rather than in silly places like "VFS Cluster debugging".  People
 should really be using COMPAT_LINUX instead of the linux module on dynamic
 systems like -current.

---
 sys/conf/NOTES      | 25 ++++++++++++++++++-------
 sys/i386/conf/NOTES | 25 ++++++++++++++++++-------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d6efcdf5cba8..eb453daa3dc7 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2559,6 +2559,22 @@ options 	NSFBUFS=1024
 #
 options 	DEBUG_LOCKS
 
+
+#####################################################################
+# ABI Emulation
+
+# Enable iBCS2 runtime support for SCO and ISC binaries
+options 	IBCS2
+
+# Emulate spx device for client side of SVR3 local X interface
+options 	SPX_HACK
+
+# Enable Linux ABI emulation
+options 	COMPAT_LINUX
+
+# Linux debugging
+options 	DEBUG_LINUX
+
 #
 # SysVR4 ABI emulation
 #
@@ -2579,11 +2595,8 @@ options		COMPAT_SVR4	# build emulator statically
 options		DEBUG_SVR4	# enable verbose debugging
 device		streams		# STREAMS network driver (required for svr4).
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-options 	IBCS2
-# Emulate spx device for client side of SVR3 local X interface
-options 	SPX_HACK
-
+
+#####################################################################
 # USB support
 # UHCI controller
 device		uhci
@@ -2715,13 +2728,11 @@ options 	CAM_DEBUG_DELAY
 
 # VFS cluster debugging.
 options 	CLUSTERDEBUG
-options 	COMPAT_LINUX
 
 # Eliminate unneeded cache flush instruction(s).
 options 	CPU_UPGRADE_HW_CACHE
 
 options 	DEBUG
-options 	DEBUG_LINUX
 
 # PECOFF module (Win32 Execution Format)
 options		PECOFF_SUPPORT
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d6efcdf5cba8..eb453daa3dc7 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2559,6 +2559,22 @@ options 	NSFBUFS=1024
 #
 options 	DEBUG_LOCKS
 
+
+#####################################################################
+# ABI Emulation
+
+# Enable iBCS2 runtime support for SCO and ISC binaries
+options 	IBCS2
+
+# Emulate spx device for client side of SVR3 local X interface
+options 	SPX_HACK
+
+# Enable Linux ABI emulation
+options 	COMPAT_LINUX
+
+# Linux debugging
+options 	DEBUG_LINUX
+
 #
 # SysVR4 ABI emulation
 #
@@ -2579,11 +2595,8 @@ options		COMPAT_SVR4	# build emulator statically
 options		DEBUG_SVR4	# enable verbose debugging
 device		streams		# STREAMS network driver (required for svr4).
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-options 	IBCS2
-# Emulate spx device for client side of SVR3 local X interface
-options 	SPX_HACK
-
+
+#####################################################################
 # USB support
 # UHCI controller
 device		uhci
@@ -2715,13 +2728,11 @@ options 	CAM_DEBUG_DELAY
 
 # VFS cluster debugging.
 options 	CLUSTERDEBUG
-options 	COMPAT_LINUX
 
 # Eliminate unneeded cache flush instruction(s).
 options 	CPU_UPGRADE_HW_CACHE
 
 options 	DEBUG
-options 	DEBUG_LINUX
 
 # PECOFF module (Win32 Execution Format)
 options		PECOFF_SUPPORT