Subject: use page_to_pfn() in __blk_queue_bounce()
From: William Lee Irwin III <[email-masked]>
To: [email-masked]
Cc: [email-masked]
Date: Tue, 25 Mar 2003 04:42:41 -0800

__blk_queue_bounce() contains an open-coded page_to_pfn() for the
discontig, non-MAP_NR_DENSE() case (wherever MAP_NR_DENSE() went).
This converts it to use the standard page_to_pfn() abstraction.

-- wli

diff -urpN linux-2.5.66/mm/highmem.c merge-2.5.66-1/mm/highmem.c
--- linux-2.5.66/mm/highmem.c	2003-03-24 14:00:50.000000000 -0800
+++ merge-2.5.66-1/mm/highmem.c	2003-03-25 04:08:01.000000000 -0800
@@ -381,7 +381,7 @@ static void __blk_queue_bounce(request_q
 		/*
 		 * is destination page below bounce pfn?
 		 */
-		if ((page - page_zone(page)->zone_mem_map) + (page_zone(page)->zone_start_pfn) < q->bounce_pfn)
+		if (page_to_pfn(page) < q->bounce_pfn)
 			continue;
 
 		/*