diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2015-03-04 21:23:20 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-03-04 21:23:20 +0100 |
| commit | aa5c86ce1d64b0793a4c21c1e7902d77ab886817 (patch) | |
| tree | 7fd74b9aecbeb31a6c0dc6f9d6053933fd8cbaed /arch | |
| parent | Linux 4.0-rc2 (diff) | |
| parent | ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n (diff) | |
| download | wireguard-linux-aa5c86ce1d64b0793a4c21c1e7902d77ab886817.tar.xz wireguard-linux-aa5c86ce1d64b0793a4c21c1e7902d77ab886817.zip | |
Merge tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Pull "Renesas ARM Based SoC Updates for v4.1" from Simon Horman:
* Do not make CMA reservation for R-Car Gen2 when HIGHMEM=n
* tag 'renesas-soc-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: No R-Car Gen2 CMA reservation when HIGHMEM=n
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index d1fa625e61f5..8c7ec9374e3b 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -21,6 +21,7 @@ #include <linux/dma-contiguous.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/memblock.h> #include <linux/of.h> #include <linux/of_fdt.h> #include <asm/mach/arch.h> @@ -199,7 +200,7 @@ void __init rcar_gen2_reserve(void) of_scan_flat_dt(rcar_gen2_scan_mem, &mrc); #ifdef CONFIG_DMA_CMA - if (mrc.size) + if (mrc.size && memblock_is_region_memory(mrc.base, mrc.size)) dma_contiguous_reserve_area(mrc.size, mrc.base, 0, &rcar_gen2_dma_contiguous, true); #endif |