From 3be2ee82668785d395230176b7dc7afafe20839c Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 19 Oct 2012 14:03:33 +0100
Subject: [PATCH] --- yaml --- r: 347454 b: refs/heads/master c:
 b92b1b89a33c172c075edccf6afb0edc41d851fd h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/virtio/virtio_ring.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2fa1b5e4604e..06c74a4fa8e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9cdc88df8e63e81c723b82c286fc97f5d0dc325
+refs/heads/master: b92b1b89a33c172c075edccf6afb0edc41d851fd
diff --git a/trunk/drivers/virtio/virtio_ring.c b/trunk/drivers/virtio/virtio_ring.c
index e639584b2dbd..286c30cb393d 100644
--- a/trunk/drivers/virtio/virtio_ring.c
+++ b/trunk/drivers/virtio/virtio_ring.c
@@ -135,6 +135,13 @@ static int vring_add_indirect(struct vring_virtqueue *vq,
 	unsigned head;
 	int i;
 
+	/*
+	 * We require lowmem mappings for the descriptors because
+	 * otherwise virt_to_phys will give us bogus addresses in the
+	 * virtqueue.
+	 */
+	gfp &= ~(__GFP_HIGHMEM | __GFP_HIGH);
+
 	desc = kmalloc((out + in) * sizeof(struct vring_desc), gfp);
 	if (!desc)
 		return -ENOMEM;