From 0f3bee1cef6b56260dcf5e7897442f8c1dbc5745 Mon Sep 17 00:00:00 2001
From: Malahal Naineni <malahal@us.ibm.com>
Date: Fri, 24 Sep 2010 20:25:49 +0200
Subject: [PATCH] --- yaml --- r: 213056 b: refs/heads/master c:
 c49825facfd4969585224a896a5e717f88450cad h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7ea941981907..34c4e106d27b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b1977698ceb4c4caa800d475127139da49966f9
+refs/heads/master: c49825facfd4969585224a896a5e717f88450cad
diff --git a/trunk/block/blk-settings.c b/trunk/block/blk-settings.c
index f8f2ddf20613..f47af5031eaa 100644
--- a/trunk/block/blk-settings.c
+++ b/trunk/block/blk-settings.c
@@ -214,16 +214,14 @@ 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;
 #else
 	if (b_pfn < blk_max_low_pfn)
 		dma = 1;
-	q->limits.bounce_pfn = b_pfn;
 #endif
+	q->limits.bounce_pfn = b_pfn;
 	if (dma) {
 		init_emergency_isa_pool();
 		q->bounce_gfp = GFP_NOIO | GFP_DMA;
-		q->limits.bounce_pfn = b_pfn;
 	}
 }
 EXPORT_SYMBOL(blk_queue_bounce_limit);