From c43a5805c751c48a76114c8d014d32f8c9c430ef Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 19 Oct 2012 14:03:32 +0100
Subject: [PATCH] --- yaml --- r: 347453 b: refs/heads/master c:
 b9cdc88df8e63e81c723b82c286fc97f5d0dc325 h: refs/heads/master i:   347451:
 9d51473bbd3717cf3eb9455506bf607f96934b29 v: v3

---
 [refs]                      | 2 +-
 trunk/net/9p/trans_virtio.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a7504983fc11..2fa1b5e4604e 100644
--- 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
index 35b8911b1c8e..fd05c81cb348 100644
--- 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--;
 		}