Merge branch 'locking-urgent-for-linus.patch' of git://git.kernel.org/pub/scm/linux...

[pandora-kernel.git] / mm / nommu.c

diff --git a/mm/nommu.c b/mm/nommu.c
index 85f8d66..b78e3a8 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -13,6 +13,8 @@
  *  Copyright (c) 2007-2010 Paul Mundt <lethal@linux-sh.org>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/export.h>
 #include <linux/mm.h>
 #include <linux/vmacache.h>
@@ -32,6 +34,7 @@
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <linux/sched/sysctl.h>
+#include <linux/printk.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlb.h>
@@ -1246,7 +1249,7 @@ error_free:
        return ret;
 
 enomem:
-       printk("Allocation of length %lu from process %d (%s) failed\n",
+       pr_err("Allocation of length %lu from process %d (%s) failed\n",
               len, current->pid, current->comm);
        show_free_areas(0);
        return -ENOMEM;