diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/virtio/virtio_balloon.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
Diffstat (limited to 'drivers/virtio/virtio_balloon.c')
| -rw-r--r-- | drivers/virtio/virtio_balloon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index c8a4332d1132..0b3efc31ee6d 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
| @@ -152,7 +152,7 @@ static void virtballoon_changed(struct virtio_device *vdev) | |||
| 152 | wake_up(&vb->config_change); | 152 | wake_up(&vb->config_change); |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | static inline int towards_target(struct virtio_balloon *vb) | 155 | static inline s64 towards_target(struct virtio_balloon *vb) |
| 156 | { | 156 | { |
| 157 | u32 v; | 157 | u32 v; |
| 158 | __virtio_config_val(vb->vdev, | 158 | __virtio_config_val(vb->vdev, |
| @@ -176,7 +176,7 @@ static int balloon(void *_vballoon) | |||
| 176 | 176 | ||
| 177 | set_freezable(); | 177 | set_freezable(); |
| 178 | while (!kthread_should_stop()) { | 178 | while (!kthread_should_stop()) { |
| 179 | int diff; | 179 | s64 diff; |
| 180 | 180 | ||
| 181 | try_to_freeze(); | 181 | try_to_freeze(); |
| 182 | wait_event_interruptible(vb->config_change, | 182 | wait_event_interruptible(vb->config_change, |