lib-documentation-synchronize-%p-formatting-documentation-fix

Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt
index ce1556c06d8fb5c2a49289e3d1e7761fbccfcb1b..9b8d7f746b1a6ad3cdfaf2d2c93675ab69f4f12c 100644 (file)
--- a/Documentation/printk-formats.txt
+++ b/Documentation/printk-formats.txt
@@ -307,9 +307,11 @@ Command from struct task_struct
 
 Ignored argument:
 
-       %pn
+       %n      %n
 
-       The argument passed will be ignored.
+       The argument passed will be ignored.  In other words, literal "%n" will
+       be in the output and the argument will be considered for next format
+       specifier.
 
 Thank you for your cooperation and attention.
 

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 6b8375c0b9466baefe62a2fc1be85d4b46c85880..5028b044d0e59f2d8545ccdfd5e6c6b3eb92b075 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1450,7 +1450,7 @@ int kptr_restrict __read_mostly;
  * - 'Cr' For a clock, it prints the current rate of the clock
  * - 'n' For ignored argument
  *
- * ** Please update Documentation/printk-formats.txt when making changes **
+ * ** Please update also Documentation/printk-formats.txt when making changes **
  *
  * Note: The difference between 'S' and 'F' is that on ia64 and ppc64
  * function pointers are really function descriptors, which contain a
@@ -1814,11 +1814,14 @@ qualifier:
  * @fmt: The format string to use
  * @args: Arguments for the format string
  *
- * This function follows C99 vsnprintf, but has some extensions.  See
- * pointer() or Documentation/printk-formats.txt for all format
- * specifiers.
+ * This function follows C99 vsnprintf, but has some extensions:
+ * %n is ignored
+ * %p* is handled by pointer()
+ *
+ * See pointer() or Documentation/printk-formats.txt for more
+ * extensive description.
  *
- * ** Please update the documentation when making changes **
+ * ** Please update the documentation on both places when making changes **
  *
  * The return value is the number of characters which would
  * be generated for the given input, excluding the trailing