[patch 31/32] xen: --- drivers/net/xen-netfront.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[Jeremy Fitzhardinge]

===================================================================
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1213,10 +1213,10 @@ static int netif_poll(struct net_device 
 	int pages_flipped = 0;
 	int err;
 
-	spin_lock_bh(&np->rx_lock);
+	spin_lock(&np->rx_lock);
 
 	if (unlikely(!netfront_carrier_ok(np))) {
-		spin_unlock_bh(&np->rx_lock);
+		spin_unlock(&np->rx_lock);
 		return 0;
 	}
 
@@ -1357,7 +1357,7 @@ err:
 		local_irq_restore(flags);
 	}
 
-	spin_unlock_bh(&np->rx_lock);
+	spin_unlock(&np->rx_lock);
 
 	return more_to_do;
 }

-- 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/