mm: simplify nodemask printing

[sfrench/cifs-2.6.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8f2b9ad2e23fc647820779c778149bfbfe0225a7..7a199767dcee174291971cc0f28738c4e8acb044 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3279,20 +3279,14 @@ void warn_alloc(gfp_t gfp_mask, nodemask_t *nodemask, const char *fmt, ...)
        if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))
                return;
 
-       pr_warn("%s: ", current->comm);
-
        va_start(args, fmt);
        vaf.fmt = fmt;
        vaf.va = &args;
-       pr_cont("%pV", &vaf);
+       pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n",
+                       current->comm, &vaf, gfp_mask, &gfp_mask,
+                       nodemask_pr_args(nodemask));
        va_end(args);
 
-       pr_cont(", mode:%#x(%pGg), nodemask=", gfp_mask, &gfp_mask);
-       if (nodemask)
-               pr_cont("%*pbl\n", nodemask_pr_args(nodemask));
-       else
-               pr_cont("(null)\n");
-
        cpuset_print_current_mems_allowed();
 
        dump_stack();