aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge Semin <fancer.lancer@gmail.com>2019-04-23 18:47:41 -0400
committerPaul Burton <paul.burton@mips.com>2019-05-02 14:22:37 -0400
commiteadb6925efeb0c254d17e1da9bb730d2add5613d (patch)
tree0a1beb176f6b2bb6afb2e9583412a6e543ee7eb3
parentb93ddc4f9156205eb3c8df6ad35a37be3fa4e31e (diff)
mips: Discard post-CMA-init foreach loop
Really the loop is pointless, since it walks over memblock-reserved memory regions and mark them as reserved in memblock. Before bootmem was removed from the kernel, this loop had been used to map the memory reserved by CMA into the legacy bootmem allocator. But now the early memory allocator is memblock, which is used by CMA for reservation, so we don't need any mapping anymore. Reviewed-by: Matt Redfearn <matt.redfearn@mips.com> Signed-off-by: Serge Semin <fancer.lancer@gmail.com> Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: Mike Rapoport <rppt@linux.ibm.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Thomas Bogendoerfer <tbogendoerfer@suse.de> Cc: Huacai Chen <chenhc@lemote.com> Cc: Stefan Agner <stefan@agner.ch> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Juergen Gross <jgross@suse.com> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org
-rw-r--r--arch/mips/kernel/setup.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index f71a7d32a687..2ae6b02b948f 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -708,7 +708,6 @@ static void __init request_crashkernel(struct resource *res)
708 */ 708 */
709static void __init arch_mem_init(char **cmdline_p) 709static void __init arch_mem_init(char **cmdline_p)
710{ 710{
711 struct memblock_region *reg;
712 extern void plat_mem_setup(void); 711 extern void plat_mem_setup(void);
713 712
714 /* 713 /*
@@ -814,10 +813,6 @@ static void __init arch_mem_init(char **cmdline_p)
814 plat_swiotlb_setup(); 813 plat_swiotlb_setup();
815 814
816 dma_contiguous_reserve(PFN_PHYS(max_low_pfn)); 815 dma_contiguous_reserve(PFN_PHYS(max_low_pfn));
817 /* Tell bootmem about cma reserved memblock section */
818 for_each_memblock(reserved, reg)
819 if (reg->size != 0)
820 memblock_reserve(reg->base, reg->size);
821 816
822 reserve_bootmem_region(__pa_symbol(&__nosave_begin), 817 reserve_bootmem_region(__pa_symbol(&__nosave_begin),
823 __pa_symbol(&__nosave_end)); /* Reserve for hibernation */ 818 __pa_symbol(&__nosave_end)); /* Reserve for hibernation */