diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-20 15:59:09 -0400 |
| commit | cbb7fe129bb2b836083ebcc256c43faff4b48cc2 (patch) | |
| tree | 65998c06e712be5f7cb72543a7c0cc2d0b1b4459 /drivers/virtio/virtio_balloon.c | |
| parent | 7b0c8fcff47a885743125dd843db64af41af5a61 (diff) | |
| parent | a939b96cccdb65df80a52447ec8e4a6d79c56dbb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
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) | |||
| 190 | try_to_freeze(); | 190 | try_to_freeze(); |
| 191 | wait_event_interruptible(vb->config_change, | 191 | wait_event_interruptible(vb->config_change, |
| 192 | (diff = towards_target(vb)) != 0 | 192 | (diff = towards_target(vb)) != 0 |
| 193 | || kthread_should_stop()); | 193 | || kthread_should_stop() |
| 194 | || freezing(current)); | ||
| 194 | if (diff > 0) | 195 | if (diff > 0) |
| 195 | fill_balloon(vb, diff); | 196 | fill_balloon(vb, diff); |
| 196 | else if (diff < 0) | 197 | else if (diff < 0) |