author: Grant Likely <grant.likely@secretlab.ca> 2012-05-31 16:26:08 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2012-05-31 17:49:27 -0700
commit: 725fe002d315c2501c110b7245d3eb4f4535f4d6
parent: d84970bbaf9a09b3fc60c18ee6d59bc9cb4c3b8a
Commit Summary:
Diffstat:
1 file changed, 5 insertions, 3 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 5391299c1e78..b8fbd275bc46 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -870,13 +870,15 @@ static noinline_for_stack
char *pointer(const char *fmt, char *buf, char *end, void *ptr,
struct printf_spec spec)
{
+ int default_width = 2 * sizeof(void *) + (spec.flags & SPECIAL ? 2 : 0);
+
if (!ptr && *fmt != 'K') {
/*
* Print (null) with the same width as a pointer so it makes
* tabular output look nice.
*/
if (spec.field_width == -1)
- spec.field_width = 2 * sizeof(void *);
+ spec.field_width = default_width;
return string(buf, end, "(null)", spec);
}
@@ -931,7 +933,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
*/
if (in_irq() || in_serving_softirq() || in_nmi()) {
if (spec.field_width == -1)
- spec.field_width = 2 * sizeof(void *);
+ spec.field_width = default_width;
return string(buf, end, "pK-error", spec);
}
if (!((kptr_restrict == 0) ||
@@ -948,7 +950,7 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
}
spec.flags |= SMALL;
if (spec.field_width == -1) {
- spec.field_width = 2 * sizeof(void *);
+ spec.field_width = default_width;
spec.flags |= ZEROPAD;
}
spec.base = 16;