aboutsummaryrefslogtreecommitdiff
path: root/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
diff options
context:
space:
mode:
Diffstat (limited to 'en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml')
-rw-r--r--en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml27
1 files changed, 2 insertions, 25 deletions
diff --git a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
index 9f6bb1c207..e3ac479e91 100644
--- a/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.xml
@@ -695,7 +695,7 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
<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>
@@ -778,29 +778,6 @@ options NFS_ROOT # NFS usable as /, requires NFSCLIENT</progra
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;&nbsp;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>
@@ -1441,7 +1418,7 @@ device fwe # Ethernet over FireWire (non-standard!)</programl
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