Merge tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

Pull virtio update from Rusty Russell:
 "Virtio patches, mainly hotplugging fixes."

* tag 'virtio-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
  virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
  virtio-blk: allow toggling host cache between writeback and writethrough
  virtio-blk: Use block layer provided spinlock
  virtio-blk: Reset device after blk_cleanup_queue()
  virtio-blk: Call del_gendisk() before disable guest kick
  virtio: rng: s3/s4 support
  virtio: rng: split out common code in probe / remove for s3/s4 ops
  virtio: rng: don't wait on host when module is going away
  virtio: rng: allow tasks to be killed that are waiting for rng input
  virtio ids: fix comment for virtio-rng

1 files changed, 34 insertions, 3 deletions

diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
index 723725bbb96b..5708299507d0 100644
--- a/drivers/char/hw_random/virtio-rng.c
+++ b/drivers/char/hw_random/virtio-rng.c
@@ -55,6 +55,7 @@ static void register_buffer(u8 *buf, size_t size)
 
 static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
 {
+        int ret;
 
         if (!busy) {
                 busy = true;
@@ -65,7 +66,9 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait)
         if (!wait)
                 return 0;
 
-        wait_for_completion(&have_data);
+        ret = wait_for_completion_killable(&have_data);
+        if (ret < 0)
+                return ret;
 
         busy = false;
 
@@ -85,7 +88,7 @@ static struct hwrng virtio_hwrng = {
         .read           = virtio_read,
 };
 
-static int virtrng_probe(struct virtio_device *vdev)
+static int probe_common(struct virtio_device *vdev)
 {
         int err;
 
@@ -103,13 +106,37 @@ static int virtrng_probe(struct virtio_device *vdev)
         return 0;
 }
 
-static void __devexit virtrng_remove(struct virtio_device *vdev)
+static void remove_common(struct virtio_device *vdev)
 {
         vdev->config->reset(vdev);
+        busy = false;
         hwrng_unregister(&virtio_hwrng);
         vdev->config->del_vqs(vdev);
 }
 
+static int virtrng_probe(struct virtio_device *vdev)
+{
+        return probe_common(vdev);
+}
+
+static void __devexit virtrng_remove(struct virtio_device *vdev)
+{
+        remove_common(vdev);
+}
+
+#ifdef CONFIG_PM
+static int virtrng_freeze(struct virtio_device *vdev)
+{
+        remove_common(vdev);
+        return 0;
+}
+
+static int virtrng_restore(struct virtio_device *vdev)
+{
+        return probe_common(vdev);
+}
+#endif
+
 static struct virtio_device_id id_table[] = {
         { VIRTIO_ID_RNG, VIRTIO_DEV_ANY_ID },
         { 0 },
@@ -121,6 +148,10 @@ static struct virtio_driver virtio_rng_driver = {
         .id_table =     id_table,
         .probe =        virtrng_probe,
         .remove =       __devexit_p(virtrng_remove),
+#ifdef CONFIG_PM
+        .freeze =       virtrng_freeze,
+        .restore =      virtrng_restore,
+#endif
 };
 
 static int __init init(void)