[PATCH v2 1/1] block: blk-merge: don't merge the pages with non-contiguous descriptors
From: tj@kernel.org (Tejun Heo)
Date: 2013-01-16 23:19:07
Also in:
linux-arm-msm, linux-mmc, linux-scsi, lkml
On Wed, Jan 16, 2013 at 10:32:35AM +0000, James Bottomley wrote:
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 6b2fb87..ab88c5b 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c@@ -809,7 +809,7 @@ static void dma_cache_maint_page(struct page *page, unsigned long offset, op(vaddr, len, dir); } offset = 0; - page++; + page = pfn_to_page(page_to_pfn(page) + 1);
Probably page = nth_page(page, 1) is the better form. Thanks. -- tejun