diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-12 23:16:51 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-12 23:16:51 +0100 |
| commit | 36eac2130cdbac08606bb2c05775e52ab79b163c (patch) | |
| tree | a8779593719f8fb661589e895aa09895c06d48ba /drivers | |
| parent | net: fix skb_defer_rx_timestamp() (diff) | |
| parent | vhost: correctly set bits of dirty pages (diff) | |
| download | linux-36eac2130cdbac08606bb2c05775e52ab79b163c.tar.xz linux-36eac2130cdbac08606bb2c05775e52ab79b163c.zip | |
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/vhost.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 94701ff3a23a..159c77a5746f 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -884,6 +884,7 @@ static int log_write(void __user *log_base, int r; if (!write_length) return 0; + write_length += write_address % VHOST_PAGE_SIZE; write_address /= VHOST_PAGE_SIZE; for (;;) { u64 base = (u64)(unsigned long)log_base; @@ -897,7 +898,7 @@ static int log_write(void __user *log_base, if (write_length <= VHOST_PAGE_SIZE) break; write_length -= VHOST_PAGE_SIZE; - write_address += VHOST_PAGE_SIZE; + write_address += 1; } return r; } |