[PATCH] mm/page_alloc: Avoid KERN_CONT uses in warn_alloc
From: Joe Perches
Date: Mon Nov 06 2017 - 13:03:03 EST
KERN_CONT/pr_cont uses should be avoided where possible.
Use single pr_warn calls instead.
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
mm/page_alloc.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 536431bf0f0c..82e6d2c914ab 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3275,19 +3275,17 @@ 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);
- va_end(args);
-
- pr_cont(", mode:%#x(%pGg), nodemask=", gfp_mask, &gfp_mask);
if (nodemask)
- pr_cont("%*pbl\n", nodemask_pr_args(nodemask));
+ pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=%*pbl\n",
+ current->comm, &vaf, gfp_mask, &gfp_mask,
+ nodemask_pr_args(nodemask));
else
- pr_cont("(null)\n");
+ pr_warn("%s: %pV, mode:%#x(%pGg), nodemask=(null)\n",
+ current->comm, &vaf, gfp_mask, &gfp_mask);
+ va_end(args);
cpuset_print_current_mems_allowed();
--
2.15.0