X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=mm%2Fbounce.c;h=ad401fc574400c50fbbf7ea80ff3e4454adfae7a;hb=7a13e932281e7042a592f4f14db0b348199e7aac;hp=e4b62d2a402495425ce1d222cdf88b4340825951;hpb=946b92437e550d6ed80213bf54a1f383e141aede;p=powerpc.git

diff --git a/mm/bounce.c b/mm/bounce.c
index e4b62d2a40..ad401fc574 100644
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -204,7 +204,7 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
 		/*
 		 * is destination page below bounce pfn?
 		 */
-		if (page_to_pfn(page) < q->bounce_pfn)
+		if (page_to_pfn(page) <= q->bounce_pfn)
 			continue;
 
 		/*
@@ -237,6 +237,8 @@ static void __blk_queue_bounce(request_queue_t *q, struct bio **bio_orig,
 	if (!bio)
 		return;
 
+	blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
+
 	/*
 	 * at least one page was bounced, fill in possible non-highmem
 	 * pages
@@ -291,8 +293,6 @@ void blk_queue_bounce(request_queue_t *q, struct bio **bio_orig)
 		pool = isa_page_pool;
 	}
 
-	blk_add_trace_bio(q, *bio_orig, BLK_TA_BOUNCE);
-
 	/*
 	 * slow path
 	 */