some updates from Pierre Riteau; tweaked by myself and tedu

2 files changed, 36 insertions, 8 deletions

diff --git a/share/man/man4/man4.amd64/cpu.4 b/share/man/man4/man4.amd64/cpu.4
index e9c8597ab07..ed4e089096f 100644
--- a/share/man/man4/man4.amd64/cpu.4
+++ b/share/man/man4/man4.amd64/cpu.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cpu.4,v 1.2 2007/05/31 19:19:53 jmc Exp $
+.\"	$OpenBSD: cpu.4,v 1.3 2007/10/31 16:25:22 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Ted Unangst
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 31 2007 $
 .Dt CPU 4 amd64
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Cd "cpu* at mainbus?"
 .Sh DESCRIPTION
 Several processor models have additional features that extend their base
-functionality, such as power and frequency control.
+functionality, such as power and frequency control or thermal monitoring.
 .Sh FREQUENCY CONTROL
 The
 .Xr sysctl 3
@@ -42,12 +42,26 @@ hw.cpuspeed will return the current operating frequency of the processor
 (on some processors this value may be an approximation).
 If possible, speed may be adjusted by altering hw.setperf from 0 to 100,
 representing percentage of maximum speed.
-There is only one possible implementation for setperf, transparent
-to the user:
+There are several possible implementations for setperf, all transparent
+to the user.
 .Bl -tag -width tenletters
+.It EST
+Enhanced SpeedStep found on Intel processors,
+offers frequency scaling with numerous positions.
 .It PowerNow
 Found on various AMD processors.
 Currently only supports a limited set of models in the K8 families.
 .El
+.Sh THERMAL MONITORING
+The
+.Xr sysctl 3
+hw.sensors.cpu*.temp0 will return the current temperature reported by the
+processor.
 .Sh SEE ALSO
 .Xr sysctl 8
+.Sh BUGS
+Due to the way in which thermal information is reported on Intel processors,
+the temperature may be off by exactly +/-15 degrees C.
+.Pp
+For multiprocessor kernels, processors will report identical temperatures
+since the temperature is taken from the processor running the sensors update.
diff --git a/share/man/man4/man4.i386/cpu.4 b/share/man/man4/man4.i386/cpu.4
index f54fb94ebf4..52896376ba0 100644
--- a/share/man/man4/man4.i386/cpu.4
+++ b/share/man/man4/man4.i386/cpu.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cpu.4,v 1.13 2007/06/20 14:09:15 jmc Exp $
+.\"	$OpenBSD: cpu.4,v 1.14 2007/10/31 16:25:22 jmc Exp $
 .\"
 .\" Copyright (c) 2004 Ted Unangst
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 20 2007 $
+.Dd $Mdocdate: October 31 2007 $
 .Dt CPU 4 i386
 .Os
 .Sh NAME
@@ -33,9 +33,12 @@
 .Cd "option I486_CPU"
 .Cd "option I586_CPU"
 .Cd "option I686_CPU"
+.Pp
+.Cd "cpu0 at mainbus?"
+.Cd "cpu* at mainbus?"
 .Sh DESCRIPTION
 Several processor models have additional features that extend their base
-functionality, such as power and frequency control or additional instructions.
+functionality, such as power and frequency control or thermal monitoring.
 .Sh FREQUENCY CONTROL
 The
 .Xr sysctl 3
@@ -83,5 +86,16 @@ If this is supported, the
 .Li libcrypto
 EVP AES functions will automatically use this support.
 .El
+.Sh THERMAL MONITORING
+The
+.Xr sysctl 3
+hw.sensors.cpu*.temp0 will return the current temperature reported by the
+processor.
 .Sh SEE ALSO
 .Xr sysctl 8
+.Sh BUGS
+Due to the way in which thermal information is reported on Intel processors,
+the temperature may be off by exactly +/-15 degrees C.
+.Pp
+For multiprocessor kernels, processors will report identical temperatures
+since the temperature is taken from the processor running the sensors update.