diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-19 19:58:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-19 19:58:20 +0200 |
| commit | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (patch) | |
| tree | c0bb21ec3474a5e3f6f25fa45139fec22f7e8575 /drivers/virtio/virtio_balloon.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | lguest: document 32-bit and PAE requirements (diff) | |
| download | linux-d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a.tar.xz linux-d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-and-virtio:
lguest: document 32-bit and PAE requirements
lguest: tell git to ignore Documentation/lguest/lguest
virtio: fix suspend when using virtio_balloon
lguest: fix guest crash on non-linear addresses in gdt pvops
lguest: fix crash on vmlinux images
Diffstat (limited to 'drivers/virtio/virtio_balloon.c')
| -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) |