Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3

[~andy/linux] / net / 9p / error.c

diff --git a/net/9p/error.c b/net/9p/error.c
index 52518512a93e86eb261b34af3dddf6778a9ea50f..2ab2de76010f0d47f67ee4a79aaf567f97026ed9 100644 (file)
--- a/net/9p/error.c
+++ b/net/9p/error.c
@@ -27,6 +27,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/list.h>
 #include <linux/jhash.h>
@@ -237,8 +239,8 @@ int p9_errstr2errno(char *errstr, int len)
        if (errno == 0) {
                /* TODO: if error isn't found, add it dynamically */
                errstr[len] = 0;
-               printk(KERN_ERR "%s: server reported unknown error %s\n",
-                       __func__, errstr);
+               pr_err("%s: server reported unknown error %s\n",
+                      __func__, errstr);
                errno = ESERVERFAULT;
        }