From 03c90378287f1cb4fa521d52c0bf7e30f9f38cd4 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 12 Mar 2015 01:23:06 +0000
Subject: [PATCH] Fix a few grammatical nits. Change wording referencing the
previous section of the kerneldebug book. Reword the 'Add these options'
sentence. Consistify spacing in the KERNCONF addition list. Fix a typo.
Sponsored by: The FreeBSD Foundation
---
.../kerneldebug/chapter.xml | 29 ++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
index 311b21907c..f990a2ef6e 100644
--- a/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
+++ b/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.xml
@@ -744,26 +744,29 @@ Debugger (msg=0xf01b0383 "Boot flags requested debugger")
<sect1 xml:id="kerneldebug-deadlocks">
<title>Debugging Deadlocks</title>
- <para>You may experience so called deadlocks, the situation where
+ <para>You may experience so called deadlocks, a situation where
a system stops doing useful work. To provide a helpful bug report
- in this situation, use &man.ddb.4; as described above.
+ in this situation, use &man.ddb.4; as described in the previous
+ section.
Include the output of <command>ps</command> and
<command>trace</command> for suspected processes in the
report.</para>
- <para>If possible, consider doing further investigation. The receipt
+ <para>If possible, consider doing further investigation. The recipe
below is especially useful if you suspect that a deadlock occurs in the
- VFS layer. Add the following options
- <programlisting>makeoptions DEBUG=-g
- options INVARIANTS
- options INVARIANT_SUPPORT
- options WITNESS
- options WITNESS_SKIPSPIN
- options DEBUG_LOCKS
- options DEBUG_VFS_LOCKS
- options DIAGNOSTIC</programlisting>
+ VFS layer. Add these options to the kernel configuration
+ file.</para>
- to the kernel configuration file. When a deadlock occurs, in addition to the
+ <programlisting>makeoptions DEBUG=-g
+options INVARIANTS
+options INVARIANT_SUPPORT
+options WITNESS
+options WITNESS_SKIPSPIN
+options DEBUG_LOCKS
+options DEBUG_VFS_LOCKS
+options DIAGNOSTIC</programlisting>
+
+ <para>When a deadlock occurs, in addition to the
output of the <command>ps</command> command, provide information
from the <command>show pcpu</command>, <command>show allpcpu</command>,
<command>show locks</command>, <command>show alllocks</command>,