Merge tag 'for-linus-v3.11-rc1' of git://oss.sgi.com/xfs/xfs

[~andy/linux] / drivers / xen / xenbus / xenbus_probe_backend.c

diff --git a/drivers/xen/xenbus/xenbus_probe_backend.c b/drivers/xen/xenbus/xenbus_probe_backend.c
index 257be37d90911d0721de9c134c0af93639519ad4..998bbbab816be6c59a4a71b8b183a2a39f053aff 100644 (file)
--- a/drivers/xen/xenbus/xenbus_probe_backend.c
+++ b/drivers/xen/xenbus/xenbus_probe_backend.c
@@ -31,9 +31,11 @@
  * IN THE SOFTWARE.
  */
 
-#define DPRINTK(fmt, args...)                          \
-       pr_debug("xenbus_probe (%s:%d) " fmt ".\n",     \
-                __func__, __LINE__, ##args)
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#define DPRINTK(fmt, ...)                              \
+       pr_debug("(%s:%d) " fmt "\n",                   \
+                __func__, __LINE__, ##__VA_ARGS__)
 
 #include <linux/kernel.h>
 #include <linux/err.h>