diff options
| author | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-28 06:06:50 +0000 |
|---|---|---|
| committer | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-28 06:06:50 +0000 |
| commit | 46be4a2b6e96971ad4892ff1cbc5de03a69edc4e (patch) | |
| tree | e72682e2c10de91b6093b9b417a0b16b93901350 | |
| parent | b4dc2718f8f4002e26c5c0a52208db16f03cf532 (diff) | |
| download | xen-46be4a2b6e96971ad4892ff1cbc5de03a69edc4e.tar.gz xen-46be4a2b6e96971ad4892ff1cbc5de03a69edc4e.tar.bz2 xen-46be4a2b6e96971ad4892ff1cbc5de03a69edc4e.zip | |
bitkeeper revision 1.1760.1.1 (42c0e8fa-Uxs1rA3BiXdTbynda9HmA)
convert some use of "if (condition) BUG()" to "BUG_ON(condition)" in netback driver.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
| -rw-r--r-- | linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c index 02f0c2fc51..faf6458083 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/netback/netback.c @@ -297,8 +297,7 @@ static void net_rx_action(unsigned long unused) netif->stats.tx_packets++; /* The update_va_mapping() must not fail. */ - if ( unlikely(mcl[0].result != 0) ) - BUG(); + BUG_ON(mcl[0].result != 0); /* Check the reassignment error code. */ status = NETIF_RSP_OKAY; @@ -441,8 +440,7 @@ static void net_tx_action(unsigned long unused) while ( dealloc_cons != dp ) { /* The update_va_mapping() must not fail. */ - if ( unlikely(mcl[0].result != 0) ) - BUG(); + BUG_ON(mcl[0].result != 0); pending_idx = dealloc_ring[MASK_PEND_IDX(dealloc_cons++)]; @@ -794,8 +792,8 @@ static int __init netback_init(void) netif_interface_init(); - if ( (mmap_vstart = allocate_empty_lowmem_region(MAX_PENDING_REQS)) == 0 ) - BUG(); + mmap_vstart = allocate_empty_lowmem_region(MAX_PENDING_REQS); + BUG_ON(mmap_vstart == 0); for ( i = 0; i < MAX_PENDING_REQS; i++ ) { |