From ed338049e26457574365e4a1da690d277a71addd Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Thu, 16 Apr 2009 21:14:04 -0300 Subject: [PATCH] --- yaml --- r: 143734 b: refs/heads/master c: 84a139a985300901dfad99bd93c7345d180af860 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/virtio/virtio_balloon.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d2ff8fa3b74..9cc836c8c22f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a489f0b555b753f9df8ddc24c7e74f657ef7ee7b +refs/heads/master: 84a139a985300901dfad99bd93c7345d180af860 diff --git a/trunk/drivers/virtio/virtio_balloon.c b/trunk/drivers/virtio/virtio_balloon.c index 59268266b79a..9c76a061a04d 100644 --- a/trunk/drivers/virtio/virtio_balloon.c +++ b/trunk/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)