This sets the default dma pad mask to ARCH_KMALLOC_MINALIGN in blk_queue_make_request(). It affects only non-coherent platforms. Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> --- block/blk-settings.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index 8dd8641..781d1bf 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -84,6 +84,11 @@ EXPORT_SYMBOL(blk_queue_softirq_done); **/ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) { +#ifndef ARCH_KMALLOC_MINALIGN +#define ARCH_KMALLOC_MINALIGN 1 +#endif + unsigned int min_align = ARCH_KMALLOC_MINALIGN; + /* * set defaults */ @@ -98,6 +103,7 @@ void blk_queue_make_request(struct request_queue *q, make_request_fn *mfn) blk_queue_max_sectors(q, SAFE_MAX_SECTORS); blk_queue_hardsect_size(q, 512); blk_queue_dma_alignment(q, 511); + blk_queue_dma_pad(q, min_align - 1); blk_queue_congestion_threshold(q); q->nr_batching = BLK_BATCH_REQ; -- 1.5.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html