From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Mar 2011 02:46:59 +0000 (-0700)
Subject: Merge branch 'docs-next' of git://git.lwn.net/linux-2.6
X-Git-Tag: v2.6.39-rc1~38
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=93567c43eb2a4771b9c590435928f9b3a428e568;hp=-c

Merge branch 'docs-next' of git://git.lwn.net/linux-2.6

* 'docs-next' of git://git.lwn.net/linux-2.6:
  docs: update the development process document
  docs: fix dev_debug() braino in dynamic-debug-howto.txt
---

93567c43eb2a4771b9c590435928f9b3a428e568
diff --combined Documentation/dynamic-debug-howto.txt
index e6c4b757025b,60ae41f234d0..f959909d7154
--- a/Documentation/dynamic-debug-howto.txt
+++ b/Documentation/dynamic-debug-howto.txt
@@@ -6,7 -6,7 +6,7 @@@ This document describes how to use the 
  
  Dynamic debug is designed to allow you to dynamically enable/disable kernel
  code to obtain additional kernel information. Currently, if
- CONFIG_DYNAMIC_DEBUG is set, then all pr_debug()/dev_debug() calls can be
+ CONFIG_DYNAMIC_DEBUG is set, then all pr_debug()/dev_dbg() calls can be
  dynamically enabled per-callsite.
  
  Dynamic debug has even more useful features:
@@@ -26,7 -26,7 +26,7 @@@
  Controlling dynamic debug Behaviour
  ===================================
  
- The behaviour of pr_debug()/dev_debug()s are controlled via writing to a
+ The behaviour of pr_debug()/dev_dbg()s are controlled via writing to a
  control file in the 'debugfs' filesystem. Thus, you must first mount the debugfs
  filesystem, in order to make use of this feature. Subsequently, we refer to the
  control file as: <debugfs>/dynamic_debug/control. For example, if you want to
@@@ -205,20 -205,12 +205,20 @@@ of the characters
  
  The flags are:
  
 +f
 +    Include the function name in the printed message
 +l
 +    Include line number in the printed message
 +m
 +    Include module name in the printed message
  p
      Causes a printk() message to be emitted to dmesg
 +t
 +    Include thread ID in messages not generated from interrupt context
  
 -Note the regexp ^[-+=][scp]+$ matches a flags specification.
 +Note the regexp ^[-+=][flmpt]+$ matches a flags specification.
  Note also that there is no convenient syntax to remove all
 -the flags at once, you need to use "-psc".
 +the flags at once, you need to use "-flmpt".
  
  
  Debug messages during boot process