summaryrefslogtreecommitdiffstats
path: root/block/blk-settings.c
diff options
context:
space:
mode:
authorJens Axboe <jaxboe@fusionio.com>2010-10-01 14:42:43 +0200
committerJens Axboe <jaxboe@fusionio.com>2010-10-01 14:42:43 +0200
commit260a67a9e534f0c7d49ddd6451833d54ba39ac81 (patch)
treeacc1fc416481201b5f38a53a9d6877c00b117fd8 /block/blk-settings.c
parentFix compile error in blk-exec.c for !CONFIG_DETECT_HUNG_TASK (diff)
downloadlinux-260a67a9e534f0c7d49ddd6451833d54ba39ac81.tar.xz
linux-260a67a9e534f0c7d49ddd6451833d54ba39ac81.zip
block: revert bad fix for memory hotplug causing bounces
Revert "block: set the bounce_pfn to the actual DMA limit rather than to max memory" This reverts commit c49825facfd4969585224a896a5e717f88450cad. Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/blk-settings.c')
-rw-r--r--block/blk-settings.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c
index f47af5031eaa..f8f2ddf20613 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -214,14 +214,16 @@ 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;
-#endif
q->limits.bounce_pfn = b_pfn;
+#endif
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);