[PATCH v2 09/15] MIPS: memblock: Simplify DMA contiguous reservation
From: Serge Semin <hidden>
Date: 2018-02-02 03:57:39
Also in:
lkml
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
CMA reserves it areas in the memblock allocator. Since we aren't using bootmem anymore, the reservations copying should be discarded. Signed-off-by: Serge Semin <redacted> --- arch/mips/kernel/setup.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 54302319ce1c..158a52c17e29 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c@@ -755,7 +755,7 @@ static void __init request_crashkernel(struct resource *res) static void __init arch_mem_init(char **cmdline_p) { - struct memblock_region *reg; + struct memblock_region *reg __maybe_unused; extern void plat_mem_setup(void); /* call board setup routine */
@@ -846,10 +846,6 @@ static void __init arch_mem_init(char **cmdline_p) plat_swiotlb_setup(); dma_contiguous_reserve(PFN_PHYS(max_low_pfn)); - /* Tell bootmem about cma reserved memblock section */ - for_each_memblock(reserved, reg) - if (reg->size != 0) - reserve_bootmem(reg->base, reg->size, BOOTMEM_DEFAULT); } static void __init resource_init(void)
--
2.12.0