Commit 13f514be authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk

Pull printk fixlet from Petr Mladek:
 "People expect to see the real pointer value for %px.

  Let's substitute '(null)' only for the other %p? format modifiers that
  need to deference the pointer"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  vsprintf: avoid misleading "(null)" for %px
parents 938e1426 3a129cc2
...@@ -1849,7 +1849,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr, ...@@ -1849,7 +1849,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
{ {
const int default_width = 2 * sizeof(void *); const int default_width = 2 * sizeof(void *);
if (!ptr && *fmt != 'K') { if (!ptr && *fmt != 'K' && *fmt != 'x') {
/* /*
* Print (null) with the same width as a pointer so it makes * Print (null) with the same width as a pointer so it makes
* tabular output look nice. * tabular output look nice.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment