diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2013-12-02 20:29:12 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-12-09 23:24:28 +0000 |
| commit | 787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8 (patch) | |
| tree | 47b4343fff33ee4169ca0f2387e47bee9d56eb03 | |
| parent | 9f28cde0bc643186d32744ce69d12222e8588fe7 (diff) | |
| download | linux-787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8.tar.gz linux-787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8.tar.bz2 linux-787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8.zip | |
ARM: 7908/1: mm: Fix the arm_dma_limit calculation
Current code is using PHYS_OFFSET to calculate the arm_dma_limit which
will lead to wrong calculations in cases where PHYS_OFFSET is updated
runtime.
So fix the code by using __pv_phys_offset instead of PHYS_OFFSET.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 3e8f106ee5fe..1f7b19a47060 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -229,7 +229,7 @@ void __init setup_dma_zone(const struct machine_desc *mdesc) #ifdef CONFIG_ZONE_DMA if (mdesc->dma_zone_size) { arm_dma_zone_size = mdesc->dma_zone_size; - arm_dma_limit = PHYS_OFFSET + arm_dma_zone_size - 1; + arm_dma_limit = __pv_phys_offset + arm_dma_zone_size - 1; } else arm_dma_limit = 0xffffffff; arm_dma_pfn_limit = arm_dma_limit >> PAGE_SHIFT; |