ia64/xen-unstable

changeset 8616:7eaa8d1a4ea0

use standard pr_debug macro for DPRINTK.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Mon Jan 16 21:43:17 2006 +0000 (2006-01-16)
parents 7ef28da1d777
children f3ce4d76650c
files linux-2.6-xen-sparse/drivers/xen/blkback/common.h linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Mon Jan 16 21:29:10 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h	Mon Jan 16 21:43:17 2006 +0000
     1.3 @@ -19,12 +19,8 @@
     1.4  #include <asm-xen/gnttab.h>
     1.5  #include <asm-xen/driver_util.h>
     1.6  
     1.7 -#if 0
     1.8 -#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
     1.9 -                           __FILE__ , __LINE__ , ## _a )
    1.10 -#else
    1.11 -#define DPRINTK(_f, _a...) ((void)0)
    1.12 -#endif
    1.13 +#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    1.14 +                                    __FILE__ , __LINE__ , ## _a )
    1.15  
    1.16  struct vbd {
    1.17  	blkif_vdev_t   handle;      /* what the domain refers to this vbd as */
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Mon Jan 16 21:29:10 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/xenbus.c	Mon Jan 16 21:43:17 2006 +0000
     2.3 @@ -24,12 +24,9 @@
     2.4  #include <asm-xen/xenbus.h>
     2.5  #include "common.h"
     2.6  
     2.7 -
     2.8 -#if 0
     2.9  #undef DPRINTK
    2.10  #define DPRINTK(fmt, args...) \
    2.11 -    printk("blkback/xenbus (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    2.12 -#endif
    2.13 +    pr_debug("blkback/xenbus (%s:%d) " fmt ".\n", __FUNCTION__, __LINE__, ##args)
    2.14  
    2.15  
    2.16  struct backend_info