aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-12-07 12:35:46 -0800
committerOlof Johansson <olof@lixom.net>2016-12-07 12:35:46 -0800
commit44c29b83de1770910b9f4d53bf78f6118da5165f (patch)
tree687fb45fa60b69442d6fbcf7522568f319ff8b7b
parent9442091ed031f79df0ddc44c8dafd7537faeb4e7 (diff)
parent7a3cc2a7b2c723aa552028f4e66841cec183756d (diff)
downloadlinux-stericsson-44c29b83de1770910b9f4d53bf78f6118da5165f.tar.gz
Merge tag 'zynq-soc-for-4.10' of https://github.com/Xilinx/linux-xlnx into next/soc
arm: Xilinx Zynq patches for v4.10 - Fix dma issue * tag 'zynq-soc-for-4.10' of https://github.com/Xilinx/linux-xlnx: ARM: zynq: Reserve correct amount of non-DMA RAM Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-zynq/common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index d12002cd63bc..ed118648313f 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -59,7 +59,7 @@ void __iomem *zynq_scu_base;
static void __init zynq_memory_init(void)
{
if (!__pa(PAGE_OFFSET))
- memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
+ memblock_reserve(__pa(PAGE_OFFSET), 0x80000);
}
static struct platform_device zynq_cpuidle_device = {