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 c49825facf
.
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
parent
e4ecda1b60
commit
260a67a9e5
|
@ -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))
|
if (b_pfn < (min_t(u64, 0xffffffffUL, BLK_BOUNCE_HIGH) >> PAGE_SHIFT))
|
||||||
dma = 1;
|
dma = 1;
|
||||||
|
q->limits.bounce_pfn = max_low_pfn;
|
||||||
#else
|
#else
|
||||||
if (b_pfn < blk_max_low_pfn)
|
if (b_pfn < blk_max_low_pfn)
|
||||||
dma = 1;
|
dma = 1;
|
||||||
#endif
|
|
||||||
q->limits.bounce_pfn = b_pfn;
|
q->limits.bounce_pfn = b_pfn;
|
||||||
|
#endif
|
||||||
if (dma) {
|
if (dma) {
|
||||||
init_emergency_isa_pool();
|
init_emergency_isa_pool();
|
||||||
q->bounce_gfp = GFP_NOIO | GFP_DMA;
|
q->bounce_gfp = GFP_NOIO | GFP_DMA;
|
||||||
|
q->limits.bounce_pfn = b_pfn;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(blk_queue_bounce_limit);
|
EXPORT_SYMBOL(blk_queue_bounce_limit);
|
||||||
|
|
Loading…
Reference in New Issue