Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rcu: Start RCU kthreads in TASK_INTERRUPTIBLE state
  rcu: Remove waitqueue usage for cpu, node, and boost kthreads
  rcu: Avoid acquiring rcu_node locks in timer functions
  atomic: Add atomic_or()
  Documentation: Add statistics about nested locks
  rcu: Decrease memory-barrier usage based on semi-formal proof
  rcu: Make rcu_enter_nohz() pay attention to nesting
  rcu: Don't do reschedule unless in irq
  rcu: Remove old memory barriers from rcu_process_callbacks()
  rcu: Add memory barriers
  rcu: Fix unpaired rcu_irq_enter() from locking selftests

1 files changed, 5 insertions, 12 deletions

diff --git a/Documentation/RCU/trace.txt b/Documentation/RCU/trace.txt
index c078ad48f7a1..8173cec473aa 100644
--- a/Documentation/RCU/trace.txt
+++ b/Documentation/RCU/trace.txt
@@ -99,18 +99,11 @@ o	"qp" indicates that RCU still expects a quiescent state from
 
 o       "dt" is the current value of the dyntick counter that is incremented
         when entering or leaving dynticks idle state, either by the
-        scheduler or by irq.  The number after the "/" is the interrupt
-        nesting depth when in dyntick-idle state, or one greater than
-        the interrupt-nesting depth otherwise.
-
-        This field is displayed only for CONFIG_NO_HZ kernels.
-
-o       "dn" is the current value of the dyntick counter that is incremented
-        when entering or leaving dynticks idle state via NMI.  If both
-        the "dt" and "dn" values are even, then this CPU is in dynticks
-        idle mode and may be ignored by RCU.  If either of these two
-        counters is odd, then RCU must be alert to the possibility of
-        an RCU read-side critical section running on this CPU.
+        scheduler or by irq.  This number is even if the CPU is in
+        dyntick idle mode and odd otherwise.  The number after the first
+        "/" is the interrupt nesting depth when in dyntick-idle state,
+        or one greater than the interrupt-nesting depth otherwise.
+        The number after the second "/" is the NMI nesting depth.
 
         This field is displayed only for CONFIG_NO_HZ kernels.