Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36eac213 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents a19faf02 e4dde731

drivers/vhost/vhost.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}