# HG changeset patch
# User vhanquez@xxxxxxxxxxxxxxxxxxxxxxx
# Node ID 49c3b00484ffd3d7d7643156530d79fb4682ab71
# Parent f3ce4d76650c3e170197255e183ecfd2fabe381e
define all DPRINTK as pr_debug
Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Mon Jan 16 21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Mon Jan 16 21:58:44 2006
@@ -69,11 +69,7 @@
#define WPRINTK(fmt, args...) ((void)0)
#endif
-#if 0
-#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
-#else
-#define DPRINTK(_f, _a...) ((void)0)
-#endif
+#define DPRINTK(_f, _a...) pr_debug ( _f , ## _a )
#if 0
#define DPRINTK_IOCTL(_f, _a...) printk ( KERN_ALERT _f , ## _a )
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/blktap/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Mon Jan 16 21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Mon Jan 16 21:58:44 2006
@@ -23,12 +23,12 @@
#define ASSERT(_p) \
if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
__LINE__, __FILE__); *(int*)0=0; }
-#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
- __FILE__ , __LINE__ , ## _a )
#else
#define ASSERT(_p) ((void)0)
-#define DPRINTK(_f, _a...) ((void)0)
#endif
+
+#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
+ __FILE__ , __LINE__ , ## _a )
#define WPRINTK(fmt, args...) printk(KERN_WARNING "blk_tap: " fmt, ##args)
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Mon Jan 16
21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Mon Jan 16
21:58:44 2006
@@ -154,13 +154,8 @@
};
#endif
-#ifdef DEBUG
-#define DPRINTK(fmt, args...) \
- printk(KERN_ALERT "netfront (%s:%d) " fmt, __FUNCTION__, \
- __LINE__, ##args)
-#else
-#define DPRINTK(fmt, args...) ((void)0)
-#endif
+#define DPRINTK(fmt, args...) pr_debug("netfront (%s:%d) " fmt, \
+ __FUNCTION__, __LINE__, ##args)
#define IPRINTK(fmt, args...) \
printk(KERN_INFO "netfront: " fmt, ##args)
#define WPRINTK(fmt, args...) \
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/tpmback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Mon Jan 16 21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Mon Jan 16 21:58:44 2006
@@ -21,12 +21,12 @@
#define ASSERT(_p) \
if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
__LINE__, __FILE__); *(int*)0=0; }
-#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
- __FILE__ , __LINE__ , ## _a )
#else
#define ASSERT(_p) ((void)0)
-#define DPRINTK(_f, _a...) ((void)0)
#endif
+
+#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
+ __FILE__ , __LINE__ , ## _a )
typedef struct tpmif_st {
struct list_head tpmif_list;
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Mon Jan 16
21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Mon Jan 16
21:58:44 2006
@@ -80,12 +80,8 @@
const u8 * buf, size_t count, int userbuffer,
void *remember);
-#if DEBUG
#define DPRINTK(fmt, args...) \
- printk(KERN_ALERT "xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__,
##args)
-#else
-#define DPRINTK(fmt, args...) ((void)0)
-#endif
+ pr_debug("xen_tpm_fr (%s:%d) " fmt, __FUNCTION__, __LINE__, ##args)
#define IPRINTK(fmt, args...) \
printk(KERN_INFO "xen_tpm_fr: " fmt, ##args)
#define WPRINTK(fmt, args...) \
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c Mon Jan 16
21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_client.c Mon Jan 16
21:58:44 2006
@@ -34,13 +34,8 @@
/* xenbus_probe.c */
extern char *kasprintf(const char *fmt, ...);
-#if 0
#define DPRINTK(fmt, args...) \
- printk("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
-#else
-#define DPRINTK(fmt, args...) ((void)0)
-#endif
-
+ pr_debug("xenbus_client (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__,
##args)
int xenbus_watch_path(struct xenbus_device *dev, const char *path,
struct xenbus_watch *watch,
diff -r f3ce4d76650c -r 49c3b00484ff
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Mon Jan 16
21:48:24 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Mon Jan 16
21:58:44 2006
@@ -27,12 +27,8 @@
* IN THE SOFTWARE.
*/
-#if 0
#define DPRINTK(fmt, args...) \
- printk("xenbus_probe (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
-#else
-#define DPRINTK(fmt, args...) ((void)0)
-#endif
+ pr_debug("xenbus_probe (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
#include <linux/kernel.h>
#include <linux/err.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home