ia64/xen-unstable

changeset 8620:927cd2e4f150

remove ASSERT macro.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vhanquez@kneesa.uk.xensource.com
date Mon Jan 16 22:07:29 2006 +0000 (2006-01-16)
parents ca795f19b613
children f1fc94516c4c
files linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c linux-2.6-xen-sparse/drivers/xen/blktap/common.h linux-2.6-xen-sparse/drivers/xen/netback/common.h linux-2.6-xen-sparse/drivers/xen/tpmback/common.h linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Jan 16 22:04:42 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Jan 16 22:07:29 2006 +0000
     1.3 @@ -35,14 +35,6 @@
     1.4   * IN THE SOFTWARE.
     1.5   */
     1.6  
     1.7 -#if 1
     1.8 -#define ASSERT(p)							   \
     1.9 -	if (!(p)) { printk("Assertion '%s' failed, line %d, file %s", #p , \
    1.10 -	__LINE__, __FILE__); *(int*)0=0; }
    1.11 -#else
    1.12 -#define ASSERT(_p)
    1.13 -#endif
    1.14 -
    1.15  #include <linux/version.h>
    1.16  #include "block.h"
    1.17  #include <linux/cdrom.h>
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Mon Jan 16 22:04:42 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h	Mon Jan 16 22:07:29 2006 +0000
     2.3 @@ -19,14 +19,6 @@
     2.4  #include <asm-xen/gnttab.h>
     2.5  #include <asm-xen/driver_util.h>
     2.6  
     2.7 -#if 0
     2.8 -#define ASSERT(_p) \
     2.9 -    if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    2.10 -    __LINE__, __FILE__); *(int*)0=0; }
    2.11 -#else
    2.12 -#define ASSERT(_p) ((void)0)
    2.13 -#endif
    2.14 -
    2.15  #define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    2.16                                      __FILE__ , __LINE__ , ## _a )
    2.17  
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Mon Jan 16 22:04:42 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h	Mon Jan 16 22:07:29 2006 +0000
     3.3 @@ -22,16 +22,8 @@
     3.4  #include <asm-xen/gnttab.h>
     3.5  #include <asm-xen/driver_util.h>
     3.6  
     3.7 -#if 0
     3.8 -#define ASSERT(_p) \
     3.9 -    if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    3.10 -    __LINE__, __FILE__); *(int*)0=0; }
    3.11 -#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
    3.12 -                           __FILE__ , __LINE__ , ## _a )
    3.13 -#else
    3.14 -#define ASSERT(_p) ((void)0)
    3.15 -#define DPRINTK(_f, _a...) ((void)0)
    3.16 -#endif
    3.17 +#define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    3.18 +                                    __FILE__ , __LINE__ , ## _a )
    3.19  #define IPRINTK(fmt, args...) \
    3.20      printk(KERN_INFO "xen_net: " fmt, ##args)
    3.21  #define WPRINTK(fmt, args...) \
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jan 16 22:04:42 2006 +0000
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h	Mon Jan 16 22:07:29 2006 +0000
     4.3 @@ -17,14 +17,6 @@
     4.4  #include <asm/io.h>
     4.5  #include <asm/pgalloc.h>
     4.6  
     4.7 -#if 0
     4.8 -#define ASSERT(_p) \
     4.9 -    if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    4.10 -    __LINE__, __FILE__); *(int*)0=0; }
    4.11 -#else
    4.12 -#define ASSERT(_p) ((void)0)
    4.13 -#endif
    4.14 -
    4.15  #define DPRINTK(_f, _a...) pr_debug("(file=%s, line=%d) " _f, \
    4.16                                      __FILE__ , __LINE__ , ## _a )
    4.17  
     5.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Mon Jan 16 22:04:42 2006 +0000
     5.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Mon Jan 16 22:07:29 2006 +0000
     5.3 @@ -54,14 +54,6 @@
     5.4  
     5.5  #undef DEBUG
     5.6  
     5.7 -#if 1
     5.8 -#define ASSERT(_p) \
     5.9 -    if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    5.10 -        __LINE__, __FILE__); *(int*)0=0; }
    5.11 -#else
    5.12 -#define ASSERT(_p)
    5.13 -#endif
    5.14 -
    5.15  /* locally visible variables */
    5.16  static grant_ref_t gref_head;
    5.17  static struct tpm_private my_private;