From 4ddd8555d79960bb11c15323ecc1a154e0777243 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 11 May 2011 16:15:24 -0400
Subject: [PATCH] --- yaml --- r: 251252 b: refs/heads/master c:
 1afbd730a33c6e4ca780a70351e8929dd4c40636 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/block/xen-blkback/common.h | 6 +++---
 trunk/drivers/block/xen-blkback/xenbus.c | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 0f5514fb10f9..69f8aec62454 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebe8190659244ec21b5f16950cf7b156f5b7eb01
+refs/heads/master: 1afbd730a33c6e4ca780a70351e8929dd4c40636
diff --git a/trunk/drivers/block/xen-blkback/common.h b/trunk/drivers/block/xen-blkback/common.h
index e37dcf7f6b8e..46e5d0630440 100644
--- a/trunk/drivers/block/xen-blkback/common.h
+++ b/trunk/drivers/block/xen-blkback/common.h
@@ -42,9 +42,9 @@
 #include <xen/grant_table.h>
 #include <xen/xenbus.h>
 
-#define DPRINTK(_f, _a...)			\
-	pr_debug("(file=%s, line=%d) " _f,	\
-		 __FILE__ , __LINE__ , ## _a)
+#define DPRINTK(fmt, args...)				\
+	pr_debug("xen-blkback: (%s:%d) " fmt ".\n",	\
+		 __func__, __LINE__, ##args)
 
 struct vbd {
 	/* What the domain refers to this vbd as. */
diff --git a/trunk/drivers/block/xen-blkback/xenbus.c b/trunk/drivers/block/xen-blkback/xenbus.c
index c86519c477f3..fa01dbbee0ad 100644
--- a/trunk/drivers/block/xen-blkback/xenbus.c
+++ b/trunk/drivers/block/xen-blkback/xenbus.c
@@ -21,11 +21,6 @@
 #include <xen/grant_table.h>
 #include "common.h"
 
-#undef DPRINTK
-#define DPRINTK(fmt, args...)				\
-	pr_debug("xen-blkback: (%s:%d) " fmt ".\n",	\
-		 __func__, __LINE__, ##args)
-
 struct backend_info {
 	struct xenbus_device	*dev;
 	struct blkif_st		*blkif;