From cceffdee0c2c3df872b99eeb354f03dea71165c8 Mon Sep 17 00:00:00 2001
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Thu, 2 Mar 2006 19:45:59 +0000
Subject: [PATCH] The altq(4) code already handles SMP so clarify what
 ALTQ_NOPCC is needed for.

---
 share/man/man4/altq.4 | 2 +-
 sys/conf/NOTES        | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/share/man/man4/altq.4 b/share/man/man4/altq.4
index d87e0d775da..280d427d8c4 100644
--- a/share/man/man4/altq.4
+++ b/share/man/man4/altq.4
@@ -94,7 +94,7 @@ Build the
 .Dq "Priority Queuing"
 discipline.
 .It Dv ALTQ_NOPCC
-Required for SMP builds.
+Required if the TSC is unusable.
 .It Dv ALTQ_DEBUG
 Enable additional debugging facilities.
 .El
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 118bc265366..a6daab6fbe2 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -501,8 +501,9 @@ options		LIBALIAS
 
 # altq(9). Enable the base part of the hooks with the ALTQ option.
 # Individual disciplines must be built into the base system and can not be
-# loaded as modules at this point. In order to build a SMP kernel you must
-# also have the ALTQ_NOPCC option.
+# loaded as modules at this point. ALTQ requires a stable TSC so if yours is
+# broken or changes with CPU throttling then you must also have the ALTQ_NOPCC
+# option.
 options 	ALTQ
 options 	ALTQ_CBQ	# Class Bases Queueing
 options 	ALTQ_RED	# Random Early Detection
@@ -510,7 +511,7 @@ options 	ALTQ_RIO	# RED In/Out
 options 	ALTQ_HFSC	# Hierarchical Packet Scheduler
 options 	ALTQ_CDNR	# Traffic conditioner
 options 	ALTQ_PRIQ	# Priority Queueing
-options 	ALTQ_NOPCC	# Required for SMP build
+options 	ALTQ_NOPCC	# Required if the TSC is unusable
 options 	ALTQ_DEBUG
 
 # netgraph(4). Enable the base netgraph code with the NETGRAPH option.