3 files changed, 6 insertions, 3 deletions

diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 8978c5508780..35332f05b15a 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -23,8 +23,11 @@ machine		amd64
 #
 # Notes:
 #
+# IPI_PREEMPTION instructs the kernel to preempt threads running on other
+#	  CPUS if needed.  Relies on the PREEMPTION option
 
 # Optional:
+options 	IPI_PREEMPTION
 device		atpic			# Optional legacy pic support
 device		mptable			# Optional MPSPEC mptable support
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 77887295dab6..651dd115c95c 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -216,8 +216,6 @@ options 	MUTEX_WAKE_ALL
 #	  performance and increase the frequency of kernel panics by
 #	  design.  If you aren't sure that you need it then you don't.
 #	  Relies on the PREEMPTION option.  DON'T TURN THIS ON.
-# IPI_PREEMPTION instructs the kernel to preempt threads running on other
-#	  CPUS if needed.  Relies on the PREEMPTION option
 # MUTEX_DEBUG enables various extra assertions in the mutex code.
 # SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table
 #	  used to hold active sleep queues.
@@ -231,7 +229,6 @@ options 	MUTEX_WAKE_ALL
 # WITNESS_SKIPSPIN disables the witness checks on spin mutexes.
 options 	PREEMPTION
 options 	FULL_PREEMPTION
-options 	IPI_PREEMPTION
 options 	MUTEX_DEBUG
 options 	WITNESS
 options 	WITNESS_KDB
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 534ad8e8c6bc..ccd85dac5b93 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -39,12 +39,15 @@ profile         2
 # MPTABLE_FORCE_HTT option.  Do NOT use this option if you have HTT
 # disabled in your BIOS.
 #
+# IPI_PREEMPTION instructs the kernel to preempt threads running on other
+# CPUS if needed.  Relies on the PREEMPTION option
 
 # Mandatory:
 device		apic			# I/O apic
 
 # Optional:
 options 	MPTABLE_FORCE_HTT	# Enable HTT CPUs with the MP Table
+options 	IPI_PREEMPTION
 
 #
 # Watchdog routines.