summaryrefslogtreecommitdiffstats
path: root/drivers/virtio
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-04-16 21:14:04 -0300
committerRusty Russell <rusty@rustcorp.com.au>2009-04-19 23:14:01 +0930
commit84a139a985300901dfad99bd93c7345d180af860 (patch)
tree62a8921435f17551db2f26c8f0755f4ab508f537 /drivers/virtio
parenta489f0b555b753f9df8ddc24c7e74f657ef7ee7b (diff)
downloadop-kernel-dev-84a139a985300901dfad99bd93c7345d180af860.zip
op-kernel-dev-84a139a985300901dfad99bd93c7345d180af860.tar.gz
virtio: fix suspend when using virtio_balloon
Break out of wait_event_interruptible() if freezing has been requested, in the vballoon thread. Without this change vballoon refuses to stop and the system can't suspend. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: stable@kernel.org
Diffstat (limited to 'drivers/virtio')
-rw-r--r--drivers/virtio/virtio_balloon.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 5926826..9c76a06 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -190,7 +190,8 @@ static int balloon(void *_vballoon)
try_to_freeze();
wait_event_interruptible(vb->config_change,
(diff = towards_target(vb)) != 0
- || kthread_should_stop());
+ || kthread_should_stop()
+ || freezing(current));
if (diff > 0)
fill_balloon(vb, diff);
else if (diff < 0)
OpenPOWER on IntegriCloud