svn commit: r41467 - projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig

[Dru Lavigne]

Author: dru
Date: Mon Apr 22 13:43:24 2013
New Revision: 41467
URL: http://svnweb.freebsd.org/changeset/doc/41467

Log:
  Delete ADAPTIVE_GIANT option and fix duplicate colon and an extra space.
  
  Submitted by:  ryusuke
  Approved by:   bcr (mentor)

Modified:
  projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml

Modified: projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
==============================================================================
--- projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Sun Apr 21 17:51:16 2013	(r41466)
+++ projects/ISBN_1-57176-407-0/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml	Mon Apr 22 13:43:24 2013	(r41467)
@@ -195,7 +195,7 @@ psm0: model Generic PS/2 mouse, device I
     <para>The <option>-k</option> flag, when passed to &man.man.1;
       can be used to provide useful information.  For example, to
       display a list of manual pages which contain the specified
-      word::</para>
+      word:</para>
 
     <screen>&prompt.root; man -k <replaceable>Atheros</replaceable></screen>
 
@@ -693,7 +693,7 @@ options          NFS_ROOT          # NFS
 
     <para>Adds support for <ulink
 	url="http://en.wikipedia.org/wiki/GUID_Partition_Table">GUID
-	  Partition Tables</ulink> (<acronym>GPT</acronym>.  GPT
+	  Partition Tables</ulink> (<acronym>GPT</acronym>).  GPT
 	provides the ability to have a large number of partitions per
 	disk, 128 in the standard configuration.</para>
 
@@ -776,29 +776,6 @@ options          NFS_ROOT          # NFS
       device nodes in <filename
 	class="directory">/dev</filename>.</para>
 
-    <programlisting>options          ADAPTIVE_GIANT    # Giant mutex is adaptive.</programlisting>
-
-    <para>Giant is the name of a mutual exclusion mechanism, a
-      sleep mutex, that protects a large set of kernel resources.
-      Today, this is an unacceptable performance bottleneck which
-      is actively being replaced with locks that protect individual
-      resources.  The <literal>ADAPTIVE_GIANT</literal> option causes
-      Giant to be included in the set of mutexes adaptively spun on.
-      When a thread wants to lock the Giant mutex, but it is already
-      locked by a thread on another CPU, the first thread will keep
-      running and wait for the lock to be released.  Normally, the
-      thread would instead go back to sleep and wait for its next
-      chance to run.  If unsure, leave this in.</para>
-
-    <note>
-      <para>Beginning with &os; 8.0, all mutexes are adaptive by
-	default, unless explicitly set to non-adaptive by compiling
-	with the <literal>NO_ADAPTIVE_MUTEXES</literal> option.  As a
-	result, Giant is adaptive by default now, and the
-	<literal>ADAPTIVE_GIANT</literal> option has been removed
-	from the kernel configuration.</para>
-    </note>
-
     <indexterm>
       <primary>kernel options</primary>
       <secondary>SMP</secondary>
@@ -1439,7 +1416,7 @@ device          fwe           # Ethernet
 	    mechanism for recovering from incompatible kernels.
 	    Simply choose the kernel to boot from at the &os; boot
 	    loader.  This can be accessed when the system boot menu
-	    appears by  selecting the <quote>Escape to a loader
+	    appears by selecting the <quote>Escape to a loader
 	      prompt</quote> option.  At the prompt, type
 	    <command>boot
 	      <replaceable>kernel.old</replaceable></command>, or