Merge branch 'for-2.6.31' of git://git.kernel.dk/linux-2.6-block

[karo-tx-linux.git] / mm / bounce.c

diff --git a/mm/bounce.c b/mm/bounce.c
index 65f5e17e411aaf78913a41129d8d63a8a7503a81..4ebe3ea837952a3f784159a9009212c3506e4a0f 100644 (file)
--- a/mm/bounce.c
+++ b/mm/bounce.c
@@ -191,7 +191,7 @@ static void __blk_queue_bounce(struct request_queue *q, struct bio **bio_orig,
                /*
                 * is destination page below bounce pfn?
                 */
-               if (page_to_pfn(page) <= q->bounce_pfn)
+               if (page_to_pfn(page) <= queue_bounce_pfn(q))
                        continue;
 
                /*
@@ -283,7 +283,7 @@ void blk_queue_bounce(struct request_queue *q, struct bio **bio_orig)
         * don't waste time iterating over bio segments
         */
        if (!(q->bounce_gfp & GFP_DMA)) {
-               if (q->bounce_pfn >= blk_max_pfn)
+               if (queue_bounce_pfn(q) >= blk_max_pfn)
                        return;
                pool = page_pool;
        } else {