evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Browse source
This commit is contained in:
David S. Miller 2010-12-12 14:16:51 -08:00
commit 36eac2130c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/vhost/vhost.c
View file

@ -884,6 +884,7 @@ static int log_write(void __user *log_base,
int r; int r;
if (!write_length) if (!write_length)
return 0; return 0;
write_length += write_address % VHOST_PAGE_SIZE;
write_address /= VHOST_PAGE_SIZE; write_address /= VHOST_PAGE_SIZE;
for (;;) { for (;;) {
u64 base = (u64)(unsigned long)log_base; 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) if (write_length <= VHOST_PAGE_SIZE)
break; break;
write_length -= VHOST_PAGE_SIZE; write_length -= VHOST_PAGE_SIZE;
write_address += VHOST_PAGE_SIZE; write_address += 1;
} }
return r; return r;
} }