ChangeSet 1.1159.258.145, 2005/05/20 20:15:35+01:00, iap10@xxxxxxxxxxxxxxxxxxxxx
Fix Linux 2.4 build.
linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h | 14
++++++++++
linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h | 11 +++++++
2 files changed, 24 insertions(+), 1 deletion(-)
diff -Nru 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
--- a/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
2005-05-20 19:03:29 -04:00
+++ b/linux-2.4.29-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
2005-05-20 19:03:29 -04:00
@@ -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 -Nru a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h 2005-05-20
19:03:29 -04:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/block.h 2005-05-20
19:03:29 -04:00
@@ -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
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home