diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2012-10-04 20:12:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:50 -0400 |
commit | 7c59154e7548429ff80384803577176466d2ab9a (patch) | |
tree | 183ba0962d9e4565f21087845cc4b8587c9a2e89 | |
parent | f40005165f7f0bda6cc268bdbcaad98a8f26fb1a (diff) |
lib/vsprintf: update documentation to cover all of %p[Mm][FR]
Acked-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | Documentation/printk-formats.txt | 1 | ||||
-rw-r--r-- | lib/vsprintf.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/printk-formats.txt b/Documentation/printk-formats.txt index 7561d7ed8e11..8ffb274367c7 100644 --- a/Documentation/printk-formats.txt +++ b/Documentation/printk-formats.txt | |||
@@ -69,6 +69,7 @@ MAC/FDDI addresses: | |||
69 | %pMR 05:04:03:02:01:00 | 69 | %pMR 05:04:03:02:01:00 |
70 | %pMF 00-01-02-03-04-05 | 70 | %pMF 00-01-02-03-04-05 |
71 | %pm 000102030405 | 71 | %pm 000102030405 |
72 | %pmR 050403020100 | ||
72 | 73 | ||
73 | For printing 6-byte MAC/FDDI addresses in hex notation. The 'M' and 'm' | 74 | For printing 6-byte MAC/FDDI addresses in hex notation. The 'M' and 'm' |
74 | specifiers result in a printed address with ('M') or without ('m') byte | 75 | specifiers result in a printed address with ('M') or without ('m') byte |
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 852f89f590a6..9287e2549936 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -987,7 +987,7 @@ int kptr_restrict __read_mostly; | |||
987 | * - 'm' For a 6-byte MAC address, it prints the hex address without colons | 987 | * - 'm' For a 6-byte MAC address, it prints the hex address without colons |
988 | * - 'MF' For a 6-byte MAC FDDI address, it prints the address | 988 | * - 'MF' For a 6-byte MAC FDDI address, it prints the address |
989 | * with a dash-separated hex notation | 989 | * with a dash-separated hex notation |
990 | * - '[mM]R For a 6-byte MAC address, Reverse order (Bluetooth) | 990 | * - '[mM]R' For a 6-byte MAC address, Reverse order (Bluetooth) |
991 | * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way | 991 | * - 'I' [46] for IPv4/IPv6 addresses printed in the usual way |
992 | * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) | 992 | * IPv4 uses dot-separated decimal without leading 0's (1.2.3.4) |
993 | * IPv6 uses colon separated network-order 16 bit hex with leading 0's | 993 | * IPv6 uses colon separated network-order 16 bit hex with leading 0's |
@@ -1338,7 +1338,10 @@ qualifier: | |||
1338 | * %pR output the address range in a struct resource with decoded flags | 1338 | * %pR output the address range in a struct resource with decoded flags |
1339 | * %pr output the address range in a struct resource with raw flags | 1339 | * %pr output the address range in a struct resource with raw flags |
1340 | * %pM output a 6-byte MAC address with colons | 1340 | * %pM output a 6-byte MAC address with colons |
1341 | * %pMR output a 6-byte MAC address with colons in reversed order | ||
1342 | * %pMF output a 6-byte MAC address with dashes | ||
1341 | * %pm output a 6-byte MAC address without colons | 1343 | * %pm output a 6-byte MAC address without colons |
1344 | * %pmR output a 6-byte MAC address without colons in reversed order | ||
1342 | * %pI4 print an IPv4 address without leading zeros | 1345 | * %pI4 print an IPv4 address without leading zeros |
1343 | * %pi4 print an IPv4 address with leading zeros | 1346 | * %pi4 print an IPv4 address with leading zeros |
1344 | * %pI6 print an IPv6 address with colons | 1347 | * %pI6 print an IPv6 address with colons |