1 files changed, 12 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6e8ecb6e021c..9dd443d89d8b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -318,6 +318,7 @@ static void bad_page(struct page *page)
                 current->comm, page_to_pfn(page));
         dump_page(page);
 
+        print_modules();
         dump_stack();
 out:
         /* Leave bad fields for debug, except PageBuddy could make trouble */
@@ -1753,7 +1754,6 @@ static DEFINE_RATELIMIT_STATE(nopage_rs,
 
 void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
 {
-        va_list args;
         unsigned int filter = SHOW_MEM_FILTER_NODES;
 
         if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))
@@ -1772,14 +1772,21 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
                 filter &= ~SHOW_MEM_FILTER_NODES;
 
         if (fmt) {
-                printk(KERN_WARNING);
+                struct va_format vaf;
+                va_list args;
+
                 va_start(args, fmt);
-                vprintk(fmt, args);
+
+                vaf.fmt = fmt;
+                vaf.va = &args;
+
+                pr_warn("%pV", &vaf);
+
                 va_end(args);
         }
 
-        pr_warning("%s: page allocation failure: order:%d, mode:0x%x\n",
-                   current->comm, order, gfp_mask);
+        pr_warn("%s: page allocation failure: order:%d, mode:0x%x\n",
+                current->comm, order, gfp_mask);
 
         dump_stack();
         if (!should_suppress_show_mem())