aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-05-20 19:15:35 +0000
committeriap10@freefall.cl.cam.ac.uk <iap10@freefall.cl.cam.ac.uk>2005-05-20 19:15:35 +0000
commitb048af9548f182814126c34379d58dcfff20cf3e (patch)
tree4e1f974c0c2f7c27ee5bda80634ff290cecab2e2
parent0474fa45ff84c8ef79cc63b239f2102dd38ea792 (diff)
downloadxen-b048af9548f182814126c34379d58dcfff20cf3e.tar.gz
xen-b048af9548f182814126c34379d58dcfff20cf3e.tar.bz2
xen-b048af9548f182814126c34379d58dcfff20cf3e.zip
bitkeeper revision 1.1159.258.145 (428e3757uj8_oSifvxuenpTuUY0rrg)
Fix Linux 2.4 build.
-rw-r--r--linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h14
-rw-r--r--linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h11
2 files changed, 24 insertions, 1 deletions
diff --git a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
index 122fef8247..88c27238a7 100644
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
+++ b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
@@ -24,6 +24,20 @@
#include <asm/uaccess.h>
#include <asm-xen/xen-public/io/blkif.h>
+#if 1
+#define IPRINTK(fmt, args...) \
+ printk(KERN_INFO "xen_blk: " fmt, ##args)
+#else
+#define IPRINTK(fmt, args...) ((void)0)
+#endif
+
+#if 1
+#define WPRINTK(fmt, args...) \
+ printk(KERN_WARNING "xen_blk: " fmt, ##args)
+#else
+#define WPRINTK(fmt, args...) ((void)0)
+#endif
+
#if 0
#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
#else
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
index 7f46506285..1a7eaf8f60 100644
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
@@ -50,11 +50,20 @@
#include <asm/atomic.h>
#include <asm/uaccess.h>
+#if 1
#define IPRINTK(fmt, args...) \
printk(KERN_INFO "xen_blk: " fmt, ##args)
+#else
+#define IPRINTK(fmt, args...) ((void)0)
+#endif
+
+#if 1
#define WPRINTK(fmt, args...) \
printk(KERN_WARNING "xen_blk: " fmt, ##args)
-
+#else
+#define WPRINTK(fmt, args...) ((void)0)
+#endif
+
#if 0
#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
#else