mm: simplify nodemask printing

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

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a501a0a1f0f899b1a61f534632ba8573e6fb85c9..c86fbd1b590ecda69741d4c1d9a9c0875d98ee69 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -426,14 +426,10 @@ static void dump_tasks(struct mem_cgroup *memcg, const nodemask_t *nodemask)
 
 static void dump_header(struct oom_control *oc, struct task_struct *p)
 {
-       pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=",
-               current->comm, oc->gfp_mask, &oc->gfp_mask);
-       if (oc->nodemask)
-               pr_cont("%*pbl", nodemask_pr_args(oc->nodemask));
-       else
-               pr_cont("(null)");
-       pr_cont(",  order=%d, oom_score_adj=%hd\n",
-               oc->order, current->signal->oom_score_adj);
+       pr_warn("%s invoked oom-killer: gfp_mask=%#x(%pGg), nodemask=%*pbl, order=%d, oom_score_adj=%hd\n",
+               current->comm, oc->gfp_mask, &oc->gfp_mask,
+               nodemask_pr_args(oc->nodemask), oc->order,
+                       current->signal->oom_score_adj);
        if (!IS_ENABLED(CONFIG_COMPACTION) && oc->order)
                pr_warn("COMPACTION is disabled!!!\n");