ia64/xen-unstable

changeset 5052:3b359c18a7f0

bitkeeper revision 1.1159.258.145 (428e3757uj8_oSifvxuenpTuUY0rrg)

Fix Linux 2.4 build.
author iap10@freefall.cl.cam.ac.uk
date Fri May 20 19:15:35 2005 +0000 (2005-05-20)
parents 574892590001
children 69fa66e71cb6
files linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
line diff
     1.1 --- a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h	Fri May 20 16:51:49 2005 +0000
     1.2 +++ b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h	Fri May 20 19:15:35 2005 +0000
     1.3 @@ -24,6 +24,20 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <asm-xen/xen-public/io/blkif.h>
     1.6  
     1.7 +#if 1
     1.8 +#define IPRINTK(fmt, args...) \
     1.9 +    printk(KERN_INFO "xen_blk: " fmt, ##args)
    1.10 +#else
    1.11 +#define IPRINTK(fmt, args...) ((void)0)
    1.12 +#endif
    1.13 +
    1.14 +#if 1
    1.15 +#define WPRINTK(fmt, args...) \
    1.16 +    printk(KERN_WARNING "xen_blk: " fmt, ##args)
    1.17 +#else
    1.18 +#define WPRINTK(fmt, args...) ((void)0)
    1.19 +#endif
    1.20 +
    1.21  #if 0
    1.22  #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
    1.23  #else
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h	Fri May 20 16:51:49 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h	Fri May 20 19:15:35 2005 +0000
     2.3 @@ -50,11 +50,20 @@
     2.4  #include <asm/atomic.h>
     2.5  #include <asm/uaccess.h>
     2.6  
     2.7 +#if 1 
     2.8  #define IPRINTK(fmt, args...) \
     2.9      printk(KERN_INFO "xen_blk: " fmt, ##args)
    2.10 +#else
    2.11 +#define IPRINTK(fmt, args...) ((void)0)
    2.12 +#endif
    2.13 +
    2.14 +#if 1 
    2.15  #define WPRINTK(fmt, args...) \
    2.16      printk(KERN_WARNING "xen_blk: " fmt, ##args)
    2.17 -
    2.18 +#else
    2.19 +#define WPRINTK(fmt, args...) ((void)0)
    2.20 +#endif
    2.21 + 
    2.22  #if 0
    2.23  #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
    2.24  #else