From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 04:47:55 +0000 (+1000)
Subject: Merge remote-tracking branch 'vhost/linux-next'
X-Git-Tag: next-20120430~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a57661c3f3711b00a2e0168ff8787f6718addf6a;p=karo-tx-linux.git

Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
	drivers/net/virtio_net.c
---

a57661c3f3711b00a2e0168ff8787f6718addf6a
diff --cc drivers/net/virtio_net.c
index fa58c7869954,3e4767f0656c..020e3b76393b
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@@ -1224,16 -1183,6 +1224,11 @@@ static int virtnet_freeze(struct virtio
  {
  	struct virtnet_info *vi = vdev->priv;
  
 +	/* Prevent config work handler from accessing the device */
 +	mutex_lock(&vi->config_lock);
 +	vi->config_enable = false;
 +	mutex_unlock(&vi->config_lock);
 +
- 	virtqueue_disable_cb(vi->rvq);
- 	virtqueue_disable_cb(vi->svq);
- 	if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_CTRL_VQ))
- 		virtqueue_disable_cb(vi->cvq);
- 
  	netif_device_detach(vi->dev);
  	cancel_delayed_work_sync(&vi->refill);