From 92b585e75666d0fda40e959e6d84253d952c236b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 21 Jun 2006 14:48:09 +0200
Subject: [PATCH] --- yaml --- r: 29202 b: refs/heads/master c:
 8269730b389d4793348d521140f9c76fb1828249 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1cb55f015330..a0f40e4de4b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd67d051529387f6e44d22d1d5540ef281965fdd
+refs/heads/master: 8269730b389d4793348d521140f9c76fb1828249
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 2270bb451385..0603ab2f3692 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -638,7 +638,7 @@ void blk_queue_bounce_limit(request_queue_t *q, u64 dma_addr)
 	/* Assume anything <= 4GB can be handled by IOMMU.
 	   Actually some IOMMUs can handle everything, but I don't
 	   know of a way to test this here. */
-	if (bounce_pfn < (0xffffffff>>PAGE_SHIFT))
+	if (bounce_pfn < (min_t(u64,0xffffffff,BLK_BOUNCE_HIGH) >> PAGE_SHIFT))
 		dma = 1;
 	q->bounce_pfn = max_low_pfn;
 #else