From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 2 Jan 2016 18:31:21 +0000 (-0500)
Subject: ... and a couple in net/9p
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=222e4adec52418dc1c80a30eff80b33ec954745e;p=openwrt%2Fstaging%2Fblogic.git

... and a couple in net/9p

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 9fc6a56c506a..199bc76202d2 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -105,7 +105,7 @@ static struct list_head virtio_chan_list;
 /* How many bytes left in this page. */
 static unsigned int rest_of_page(void *data)
 {
-	return PAGE_SIZE - ((unsigned long)data % PAGE_SIZE);
+	return PAGE_SIZE - offset_in_page(data);
 }
 
 /**
@@ -365,7 +365,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
 			return -ENOMEM;
 
 		*need_drop = 0;
-		p -= (*offs = (unsigned long)p % PAGE_SIZE);
+		p -= (*offs = offset_in_page(p));
 		for (index = 0; index < nr_pages; index++) {
 			if (is_vmalloc_addr(p))
 				(*pages)[index] = vmalloc_to_page(p);