---

yaml --- r: 347453 b: refs/heads/master c: b9cdc88 h: refs/heads/master i: 347451: 9d51473 v: v3
git-mirror · Oct 22, 2012 · c43a580 · c43a580
1 parent f3a2971
commit c43a580
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0263d2d222e9e25f2587e51a9dc58c6fb2a9352
+refs/heads/master: b9cdc88df8e63e81c723b82c286fc97f5d0dc325
diff --git a/trunk/net/9p/trans_virtio.c b/trunk/net/9p/trans_virtio.c
@@ -39,6 +39,7 @@
 #include <linux/inet.h>
 #include <linux/idr.h>
 #include <linux/file.h>
+#include <linux/highmem.h>
 #include <linux/slab.h>
 #include <net/9p/9p.h>
 #include <linux/parser.h>
@@ -325,7 +326,7 @@ static int p9_get_mapped_pages(struct virtio_chan *chan,
 		int count = nr_pages;
 		while (nr_pages) {
 			s = rest_of_page(data);
-			pages[index++] = virt_to_page(data);
+			pages[index++] = kmap_to_page(data);
 			data += s;
 			nr_pages--;
 		}