]> Pileus Git - ~andy/linux/commitdiff
Revert "ARM: 7908/1: mm: Fix the arm_dma_limit calculation"
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Jan 2014 17:53:54 +0000 (17:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Jan 2014 17:53:54 +0000 (17:53 +0000)
This reverts commit 787b0d5c1ca7ff24feb6f92e4c7f4410ee7d81a8 since
it is no longer required after 7909/1 was applied, and it causes
build regressions when ARM_PATCH_PHYS_VIRT is disabled and DMA_ZONE
is enabled.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/init.c

index 1f7b19a470606726595ebc692f3b05aae94729c6..3e8f106ee5fe01855fe12f66b0c581822c0521da 100644 (file)
@@ -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 = __pv_phys_offset + arm_dma_zone_size - 1;
+               arm_dma_limit = PHYS_OFFSET + arm_dma_zone_size - 1;
        } else
                arm_dma_limit = 0xffffffff;
        arm_dma_pfn_limit = arm_dma_limit >> PAGE_SHIFT;