From b32f6f01e6731e67034410818df2d9cfe7b0be38 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xensource.com>
Date: Tue, 17 Jun 2008 10:47:08 +0200
Subject: [PATCH] --- yaml --- r: 98888 b: refs/heads/master c:
 1c91fe1a0d577f2e53475e789c9d63a0feb7d93c h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/xen-blkfront.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4330d02f0005..3ec19b903257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 244b4d56f85bcd11b21ab0b94845a3dabeed5c10
+refs/heads/master: 1c91fe1a0d577f2e53475e789c9d63a0feb7d93c
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index f2fff5799ddf..e8d3bf6f3918 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -324,6 +324,9 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size)
 	/* Make sure buffer addresses are sector-aligned. */
 	blk_queue_dma_alignment(rq, 511);
 
+	/* Make sure we don't use bounce buffers. */
+	blk_queue_bounce_limit(rq, BLK_BOUNCE_ANY);
+
 	gd->queue = rq;
 
 	return 0;