Merge branch 'master' into vpcvpc

3 files changed, 15 insertions, 43 deletions

diff --git a/usr/src/man/man4/fx_dptbl.4 b/usr/src/man/man4/fx_dptbl.4
index 4373e7705c..ce2ad1bc3f 100644
--- a/usr/src/man/man4/fx_dptbl.4
+++ b/usr/src/man/man4/fx_dptbl.4
@@ -7,14 +7,11 @@
 .SH NAME
 fx_dptbl \- fixed priority dispatcher parameter table
 .SH SYNOPSIS
-.LP
 .nf
 \fBfx_dptbl\fR
 .fi
 
 .SH DESCRIPTION
-.sp
-.LP
 The process scheduler or dispatcher is the portion of the kernel that controls
 allocation of the CPU to processes. The scheduler supports the notion of
 scheduling classes, where each class defines a scheduling policy used to
@@ -67,9 +64,11 @@ processes at a particular level, as the time quantum of a fixed priority
 process can be changed by the user with the \fBpriocntl\fR(1) command or the
 \fBpriocntl\fR(2) system call.
 .sp
-In the high resolution clock mode (\fBhires_tick\fR set to \fB1\fR), the value
-of \fBhz\fR is set to \fB1000\fR. Increase quantums to maintain the same
-absolute time quantums.
+In the default high resolution clock mode (\fBhires_tick\fR set to \fB1\fR),
+the value of \fBhz\fR is set to \fB1000\fR.  If this value is overridden to
+\fB0\fR then \fBhz\fR will instead be \fB100\fR; the number of ticks per
+quantum must then be decreased to maintain the same length of quantum in
+absolute time.
 .sp
 An administrator can affect the behavior of the fixed priority portion of the
 scheduler by reconfiguring the \fBfx_dptbl\fR. There are two methods available
@@ -78,8 +77,6 @@ for doing this: reconfigure with a loadable module at boot-time or by using
 .RE
 
 .SS "fx_dptbl Loadable Module"
-.sp
-.LP
 The \fBfx_dptbl\fR can be reconfigured with a loadable module that contains a
 new fixed priority dispatch table. The module containing the dispatch table is
 separate from the \fBFX\fR loadable module, which contains the rest of the
@@ -88,8 +85,6 @@ number of fixed priority priority levels or the set of global scheduling
 priorities used by the fixed priority class. The relevant procedure and source
 code is described in Replacing the fx_dptbl Loadable Module below.
 .SS "dispadmin Configuration File"
-.sp
-.LP
 The \fBfx_quantum\fR values in the \fBfx_dptbl\fR can be examined and modified
 on a running system using the \fBdispadmin\fR(1M) command. Invoking
 \fBdispadmin\fR for the fixed-priority class allows the administrator to
@@ -141,8 +136,6 @@ positive integer specifying the desired time quantum in the resolution given by
 See Examples for an example of an excerpt of a \fBdispadmin\fR configuration
 file.
 .SS "Replacing the fx_dptbl Loadable Module"
-.sp
-.LP
 To change the size of the fixed priority dispatch table, you must build the
 loadable module that contains the dispatch table information. Save the existing
 module before using the following procedure.
@@ -202,7 +195,6 @@ Reboot the system to use the new dispatch table.
 Exercise great care in using the preceding method to replace the dispatch
 table. A mistake can result in panics, thus making the system unusable.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRConfiguration File Excerpt
 .sp
 .LP
@@ -395,15 +387,11 @@ fx_getmaxumdpri()
 .sp
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpriocntl\fR(1), \fBdispadmin\fR(1M), \fBpriocntl\fR(2), \fBsystem\fR(4)
 .sp
 .LP
 \fISystem Administration Guide, Volume 1, System Interface Guide\fR
 .SH NOTES
-.sp
-.LP
 In order to improve performance under heavy system load, both the \fBnfsd\fR
 daemon and the \fBlockd\fR daemon utilize the maximum priority in the \fBFX\fR
 class. Unusual \fBfx_dptbl\fR configurations may have significant negative
diff --git a/usr/src/man/man4/rt_dptbl.4 b/usr/src/man/man4/rt_dptbl.4
index b24b3d72f4..bace4ec80b 100644
--- a/usr/src/man/man4/rt_dptbl.4
+++ b/usr/src/man/man4/rt_dptbl.4
@@ -7,8 +7,6 @@
 .SH NAME
 rt_dptbl \- real-time dispatcher parameter table
 .SH DESCRIPTION
-.sp
-.LP
 The process scheduler (or dispatcher) is the portion of the kernel that
 controls allocation of the \fBCPU\fR to processes. The scheduler supports the
 notion of scheduling classes where each class defines a scheduling policy, used
@@ -59,9 +57,11 @@ processes at a particular level as the time quantum of a real-time process can
 be changed by the user with the \fBpriocntl\fR command or the \fBpriocntl\fR
 system call.
 .sp
-In the high resolution clock mode (\fBhires_tick\fR set to \fB1\fR), the value
-of \fBhz\fR is set to \fB1000\fR. Increase quantums to maintain the same
-absolute time quantums.
+In the default high resolution clock mode (\fBhires_tick\fR set to \fB1\fR),
+the value of \fBhz\fR is set to \fB1000\fR.  If this value is overridden to
+\fB0\fR then \fBhz\fR will instead be \fB100\fR; the number of ticks per
+quantum must then be decreased to maintain the same length of quantum in
+absolute time.
 .RE
 
 .sp
@@ -71,8 +71,6 @@ scheduler by reconfiguring the \fBrt_dptbl\fR. There are two methods available
 for doing this: reconfigure with a loadable module at boot-time or by using
 \fBdispadmin\fR(1M) at run-time.
 .SS "rt_dptbl Loadable Module"
-.sp
-.LP
 The \fBrt_dptbl\fR can be reconfigured with a loadable module which contains a
 new real time dispatch table. The module containing the dispatch table is
 separate from the RT loadable module which contains the rest of the real time
@@ -81,8 +79,6 @@ time priority levels or the set of global scheduling priorities used by the
 real time class. The relevant procedure and source code is described in the
 Examples section.
 .SS "dispadmin Configuration File"
-.sp
-.LP
 The \fBrt_quantum\fR values in the \fBrt_dptbl\fR can be examined and modified
 on a running system using the \fBdispadmin\fR(1M) command. Invoking
 \fBdispadmin\fR for the real-time class allows the administrator to retrieve
@@ -120,7 +116,6 @@ level. Each \fBrt_quantum\fR entry must be either a positive integer specifying
 the desired time quantum (in the resolution given by \fIres\fR), or the value
 -2 indicating an infinite time quantum for that level.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRA Sample \fBdispadmin\fR Configuration File
 .sp
 .LP
@@ -341,8 +336,6 @@ rtdpent_t       config_rt_dptbl[] = {
 .in -2
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpriocntl\fR(1), \fBdispadmin\fR(1M), \fBpriocntl\fR(2), \fBsystem\fR(4)
 .sp
 .LP
diff --git a/usr/src/man/man4/ts_dptbl.4 b/usr/src/man/man4/ts_dptbl.4
index f6e7db3482..9dbcc11d15 100644
--- a/usr/src/man/man4/ts_dptbl.4
+++ b/usr/src/man/man4/ts_dptbl.4
@@ -7,8 +7,6 @@
 .SH NAME
 ts_dptbl \- time-sharing dispatcher parameter table
 .SH DESCRIPTION
-.sp
-.LP
 The process scheduler (or dispatcher) is the portion of the kernel that
 controls allocation of the \fBCPU\fR to processes. The scheduler supports the
 notion of scheduling classes where each class defines a scheduling policy, used
@@ -65,9 +63,11 @@ only member of the \fBts_dptbl\fR which cannot be changed with
 The length of the time quantum allocated to processes at this level in ticks
 (\fBhz\fR).
 .sp
-In the high resolution clock mode (\fBhires_tick\fR set to \fB1\fR), the value
-of \fBhz\fR is set to \fB1000\fR. Increase quantums to maintain the same
-absolute time quantums.
+In the default high resolution clock mode (\fBhires_tick\fR set to \fB1\fR),
+the value of \fBhz\fR is set to \fB1000\fR.  If this value is overridden to
+\fB0\fR then \fBhz\fR will instead be \fB100\fR; the number of ticks per
+quantum must then be decreased to maintain the same length of quantum in
+absolute time.
 .RE
 
 .sp
@@ -129,8 +129,6 @@ scheduling classes. There are two methods available for doing this: reconfigure
 with a loadable module at boot-time or by using \fBdispadmin\fR(1M) at
 run-time.
 .SS "ts_dptbl Loadable Module"
-.sp
-.LP
 The \fBts_dptbl\fR can be reconfigured with a loadable module which contains a
 new time sharing dispatch table. The module containing the dispatch table is
 separate from the TS loadable module which contains the rest of the
@@ -140,8 +138,6 @@ scheduling priorities used by the time-sharing and inter-active classes. The
 relevant procedure and source code is described in the \fBREPLACING THE
 TS_DPTBL LOADABLE MODULE\fR section.
 .SS "dispadmin Configuration File"
-.sp
-.LP
 With the exception of \fBts_globpri\fR all of the members of the \fBts_dptbl\fR
 can be examined and modified on a running system using the \fBdispadmin\fR(1M)
 command. Invoking \fBdispadmin\fR for the time-sharing or inter-active class
@@ -177,7 +173,6 @@ parameters for time-sharing level 0, the second line specifies the parameters
 for time-sharing level 1, etc. There must be exactly one line for each
 configured time-sharing priority level.
 .SH EXAMPLES
-.LP
 \fBExample 1 \fRA Sample From a Configuration File
 .sp
 .LP
@@ -435,8 +430,6 @@ ts_getmaxumdpri()
 .in -2
 
 .SH SEE ALSO
-.sp
-.LP
 \fBpriocntl\fR(1), \fBdispadmin\fR(1M), \fBpriocntl\fR(2), \fBsystem\fR(4)
 .sp
 .LP
@@ -445,8 +438,6 @@ ts_getmaxumdpri()
 .LP
 \fIProgramming Interfaces Guide\fR
 .SH NOTES
-.sp
-.LP
 \fBdispadmin\fR does some limited sanity checking on the values supplied in the
 configuration file. The sanity checking is intended to ensure that the new
 \fBts_dptbl\fR values do not cause the system to panic. The sanity checking