# HG changeset patch
# User vhanquez@xxxxxxxxxxxxxxxxxxxxxxx
# Node ID 927cd2e4f150b078e04a27b540469e3e21c792e8
# Parent ca795f19b613749232e6a58a4db2d9287747a0d6
remove ASSERT macro.
Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>
diff -r ca795f19b613 -r 927cd2e4f150
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Mon Jan 16
22:04:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Mon Jan 16
22:07:29 2006
@@ -35,14 +35,6 @@
* IN THE SOFTWARE.
*/
-#if 1
-#define ASSERT(p) \
- if (!(p)) { printk("Assertion '%s' failed, line %d, file %s", #p , \
- __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p)
-#endif
-
#include <linux/version.h>
#include "block.h"
#include <linux/cdrom.h>
diff -r ca795f19b613 -r 927cd2e4f150
linux-2.6-xen-sparse/drivers/xen/blktap/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Mon Jan 16 22:04:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Mon Jan 16 22:07:29 2006
@@ -18,14 +18,6 @@
#include <asm-xen/xen-public/io/ring.h>
#include <asm-xen/gnttab.h>
#include <asm-xen/driver_util.h>
-
-#if 0
-#define ASSERT(_p) \
- if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
- __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p) ((void)0)
-#endif
#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
__FILE__ , __LINE__ , ## _a )
diff -r ca795f19b613 -r 927cd2e4f150
linux-2.6-xen-sparse/drivers/xen/netback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h Mon Jan 16 22:04:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h Mon Jan 16 22:07:29 2006
@@ -22,16 +22,8 @@
#include <asm-xen/gnttab.h>
#include <asm-xen/driver_util.h>
-#if 0
-#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 IPRINTK(fmt, args...) \
printk(KERN_INFO "xen_net: " fmt, ##args)
#define WPRINTK(fmt, args...) \
diff -r ca795f19b613 -r 927cd2e4f150
linux-2.6-xen-sparse/drivers/xen/tpmback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Mon Jan 16 22:04:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Mon Jan 16 22:07:29 2006
@@ -16,14 +16,6 @@
#include <asm-xen/xen-public/io/tpmif.h>
#include <asm/io.h>
#include <asm/pgalloc.h>
-
-#if 0
-#define ASSERT(_p) \
- if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
- __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p) ((void)0)
-#endif
#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
__FILE__ , __LINE__ , ## _a )
diff -r ca795f19b613 -r 927cd2e4f150
linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Mon Jan 16
22:04:42 2006
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Mon Jan 16
22:07:29 2006
@@ -54,14 +54,6 @@
#undef DEBUG
-#if 1
-#define ASSERT(_p) \
- if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
- __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p)
-#endif
-
/* locally visible variables */
static grant_ref_t gref_head;
static struct tpm_private my_private;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home