| Message ID | 1408610714-16204-3-git-send-email-m.szyprowski@samsung.com |
|---|---|
| State | Accepted |
| Commit | 95b0e655f9148881907fdbe5baba6a9f5d094fee |
| Headers | show |
On Thu, Aug 21 2014, Marek Szyprowski <m.szyprowski@samsung.com> wrote: > DMA-mapping supports CMA regions places either in low or high memory, so > there is no longer needed to limit default CMA regions only to low memory. > The real limit is still defined by architecture specific DMA limit. > > Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> > Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> > --- > arch/arm/mm/init.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > index 659c75d808dc..c1b513555786 100644 > --- a/arch/arm/mm/init.c > +++ b/arch/arm/mm/init.c > @@ -322,7 +322,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) > * reserve memory for DMA contigouos allocations, > * must come from DMA area inside low memory > */ > - dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit)); > + dma_contiguous_reserve(arm_dma_limit); > > arm_memblock_steal_permitted = false; > memblock_dump_all(); > -- > 1.9.2 >
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 659c75d808dc..c1b513555786 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -322,7 +322,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory */ - dma_contiguous_reserve(min(arm_dma_limit, arm_lowmem_limit)); + dma_contiguous_reserve(arm_dma_limit); arm_memblock_steal_permitted = false; memblock_dump_all();
DMA-mapping supports CMA regions places either in low or high memory, so there is no longer needed to limit default CMA regions only to low memory. The real limit is still defined by architecture specific DMA limit. Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> --- arch/arm/mm/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)