Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 510d22f4 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: replace alloc_bootmem_low with memblock_alloc_low (2)

The alloc_bootmem_low(size) allocates low memory with default alignment
and can be replaced by memblock_alloc_low(size, 0)

Link: http://lkml.kernel.org/r/1536927045-23536-13-git-send-email-rppt@linux.vnet.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greentime Hu <green.hu@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Palmer Dabbelt <palmer@sifive.com>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Serge Semin <fancer.lancer@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 238997e5
Loading
Loading
Loading
Loading
+3 −2
Original line number Original line Diff line number Diff line
@@ -217,8 +217,9 @@ static void __init request_standard_resources(void)
	kernel_data.end     = __pa_symbol(_end - 1);
	kernel_data.end     = __pa_symbol(_end - 1);


	num_standard_resources = memblock.memory.cnt;
	num_standard_resources = memblock.memory.cnt;
	standard_resources = alloc_bootmem_low(num_standard_resources *
	standard_resources = memblock_alloc_low(num_standard_resources *
					       sizeof(*standard_resources));
					        sizeof(*standard_resources),
					        0);


	for_each_memblock(memory, region) {
	for_each_memblock(memory, region) {
		res = &standard_resources[i++];
		res = &standard_resources[i++];
+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ request_standard_resources(struct meminfo *mi)
		if (mi->bank[i].size == 0)
		if (mi->bank[i].size == 0)
			continue;
			continue;


		res = alloc_bootmem_low(sizeof(*res));
		res = memblock_alloc_low(sizeof(*res), 0);
		res->name  = "System RAM";
		res->name  = "System RAM";
		res->start = mi->bank[i].start;
		res->start = mi->bank[i].start;
		res->end   = mi->bank[i].start + mi->bank[i].size - 1;
		res->end   = mi->bank[i].start + mi->bank[i].size - 1;