diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 14:53:27 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-09-10 15:04:19 +0200 |
| commit | d5bbf34613a877dbe3da847fa0432da8c6721e73 (patch) | |
| tree | 902a90fd7eda61aad7abae9c35b0da2e7a786995 /arch/arm/mm/init.c | |
| parent | c6c1f7a2c194f1a2291a15c6691c0d6785f8976e (diff) | |
| parent | 336961dd3cf9c39456dd9657e8f205718740c797 (diff) | |
Merge branch 'l4t/l4t-r16' into colibri
Merge with latest NVIDIA L4T R16.
Only real conflict concerning inverted VBUS gpio support.
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index f8037ba338ac..6f81c8e05c3a 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -364,6 +364,9 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc) #endif arm_mm_memblock_reserve(); +#if defined(CONFIG_NON_ALIASED_COHERENT_MEM) + dma_coherent_reserve(); +#endif arm_dt_memblock_reserve(); /* reserve any platform specific memblock areas */ |