diff options
| author | ach61@arcadians.cl.cam.ac.uk <ach61@arcadians.cl.cam.ac.uk> | 2005-06-28 07:23:41 +0000 |
|---|---|---|
| committer | ach61@arcadians.cl.cam.ac.uk <ach61@arcadians.cl.cam.ac.uk> | 2005-06-28 07:23:41 +0000 |
| commit | 1fb3599164030b5f236b2a52ce3b161d5871861d (patch) | |
| tree | 4761226fe91e22e964c18b0f8bed590ca2a5d19c | |
| parent | 6d2562c9f0f3badd4e76fe389839976eeaf61693 (diff) | |
| parent | 46be4a2b6e96971ad4892ff1cbc5de03a69edc4e (diff) | |
| download | xen-1fb3599164030b5f236b2a52ce3b161d5871861d.tar.gz xen-1fb3599164030b5f236b2a52ce3b161d5871861d.tar.bz2 xen-1fb3599164030b5f236b2a52ce3b161d5871861d.zip | |
bitkeeper revision 1.1762 (42c0fafdBom2bVfipwX4FXIl_SgKmg)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/ach61/bk
| -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++ ) { |