diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:57:18 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-01-03 10:57:18 +0800 |
| commit | 6a90545e6e920c480f5d05e4d5c0aa105e932bd1 (patch) | |
| tree | 4c3d1d871a9f26d623a40610238d85a45f07f9cd /arch/arm/include/asm/dma-mapping.h | |
| parent | 41a1275cfab8df9a709933657ad6ad685216fbd3 (diff) | |
| parent | 1e20e732ffa107e21f2089ce56e32d99b9229944 (diff) | |
Merge tag 'v3.18.46' into linux-linaro-lsk-v3.18
This is the 3.18.46 stable release
Diffstat (limited to 'arch/arm/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index f3c0d953f6a2..e7bef0ab9793 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -117,7 +117,7 @@ static inline dma_addr_t virt_to_dma(struct device *dev, void *addr) /* The ARM override for dma_max_pfn() */ static inline unsigned long dma_max_pfn(struct device *dev) { - return PHYS_PFN_OFFSET + dma_to_pfn(dev, *dev->dma_mask); + return dma_to_pfn(dev, *dev->dma_mask); } #define dma_max_pfn(dev) dma_max_pfn(dev) |