From 3589ec12202129fb09ba7bcf2f0bb8522b0edc57 Mon Sep 17 00:00:00 2001
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 1 Oct 2010 14:45:27 +0200
Subject: [PATCH] --- yaml --- r: 213059 b: refs/heads/master c:
 efb012b361cf9319cd86ff169afa7550b7aa9336 h: refs/heads/master i:   213057:
 f70ac86c8f6d9ff5cac9c70af3ea519b8d5b04a6   213055:
 8f6665afff79f98e63561fe7629cb35764d132a0 v: v3

---
 [refs]                     | 2 +-
 trunk/block/blk-settings.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a5f6a9088b60..d2d6b11abe68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 260a67a9e534f0c7d49ddd6451833d54ba39ac81
+refs/heads/master: efb012b361cf9319cd86ff169afa7550b7aa9336
diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c
index f8f2ddf20613..a3600a7ab8bb 100644
--- a/trunk/block/blk-settings.c
+++ b/trunk/block/blk-settings.c
@@ -214,7 +214,7 @@ void blk_queue_bounce_limit(struct request_queue *q, u64 dma_mask)
 	 */
 	if (b_pfn < (min_t(u64, 0xffffffffUL, BLK_BOUNCE_HIGH) >> PAGE_SHIFT))
 		dma = 1;
-	q->limits.bounce_pfn = max_low_pfn;
+	q->limits.bounce_pfn = max(max_low_pfn, b_pfn);
 #else
 	if (b_pfn < blk_max_low_pfn)
 		dma = 1;