diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
| commit | a66f9577c6e5280d83d45152aea29cf5e4548858 (patch) | |
| tree | ebb42fa6ef16a535adbd5acb8cc79bdd2980da24 /arch/arm/include/asm/dma-mapping.h | |
| parent | 26700159745df7db2bc75e8032d2a36913c37880 (diff) | |
| parent | 2308e34317c8cc7beb03a3d18dc39d32015eff06 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
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 ccb3aa64640d..b91a2d17a521 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -119,7 +119,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) |