bitkeeper revision 1.643 (3fcdbd83juXhc2c1Z5SkD1HAC6kDuA)

Merge laudney.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into laudney.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/br260/lab/xeno.bk

tools/xc/lib/xc_private.h

@@ -105,8 +105,6 @@ static inline int do_dom0_op(int xc_handle, dom0_op_t *op)
         goto out2;
     }
 
-    ret = 0;
-
  out2: (void)munlock(op, sizeof(*op));
  out1: return ret;
 }
@@ -128,8 +126,6 @@ static inline int do_network_op(int xc_handle, network_op_t *op)
     if ( (ret = do_xen_hypercall(xc_handle, &hypercall)) < 0 )
         goto out2;
 
-    ret = 0;
-
  out2: (void)munlock(op, sizeof(*op));
  out1: return ret;
 }