diff options
| author | Marcelo Tosatti | 2009-04-17 02:14:04 +0200 |
|---|---|---|
| committer | Rusty Russell | 2009-04-19 15:44:01 +0200 |
| commit | 84a139a985300901dfad99bd93c7345d180af860 (patch) | |
| tree | 62a8921435f17551db2f26c8f0755f4ab508f537 /drivers/virtio | |
| parent | lguest: fix guest crash on non-linear addresses in gdt pvops (diff) | |
| download | kernel-qcow2-linux-84a139a985300901dfad99bd93c7345d180af860.tar.gz kernel-qcow2-linux-84a139a985300901dfad99bd93c7345d180af860.tar.xz kernel-qcow2-linux-84a139a985300901dfad99bd93c7345d180af860.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 59268266b79a..9c76a061a04d 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) |