Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / drivers / xen / xenbus / xenbus_dev_frontend.c

diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index ac727028e658f75778fa916ca94e91c5d80e0737..85534ea6355588a79a2f589963edb7c146ebac83 100644 (file)
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -35,6 +35,8 @@
  *                              Turned xenfs into a loadable module.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/uio.h>
@@ -616,7 +618,7 @@ static int __init xenbus_init(void)
 
        err = misc_register(&xenbus_dev);
        if (err)
-               printk(KERN_ERR "Could not register xenbus frontend device\n");
+               pr_err("Could not register xenbus frontend device\n");
        return err;
 }