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

Commit 9415673e authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

arch: use memblock_alloc() instead of memblock_alloc_from(size, align, 0) 

The last parameter of memblock_alloc_from() is the lower limit for the
memory allocation.  When it is 0, the call is equivalent to
memblock_alloc().

Link: http://lkml.kernel.org/r/1548057848-15136-13-git-send-email-rppt@linux.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS part
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Dennis Zhou <dennis@kernel.org>
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: Guo Ren <guoren@kernel.org>
Cc: Guo Ren <ren_guo@c-sky.com>				[c-sky]
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Juergen Gross <jgross@suse.com>			[Xen]
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Petr Mladek <pmladek@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
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 c366ea89

arch/alpha/kernel/core_cia.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ cia_prepare_tbia_workaround(int window) 
	long i;



	/* Use minimal 1K map. */

	ppte = memblock_alloc_from(CIA_BROKEN_TBIA_SIZE, 32768, 0);

	ppte = memblock_alloc(CIA_BROKEN_TBIA_SIZE, 32768);

	pte = (virt_to_phys(ppte) >> (PAGE_SHIFT - 1)) | 1;



	for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i)

arch/alpha/kernel/pci_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, 
		printk("%s: couldn't allocate arena ptes from node %d\n"

		       "    falling back to system-wide allocation\n",

		       __func__, nid);

		arena->ptes = memblock_alloc_from(mem_size, align, 0);

		arena->ptes = memblock_alloc(mem_size, align);

	}



#else /* CONFIG_DISCONTIGMEM */



	arena = memblock_alloc(sizeof(*arena), SMP_CACHE_BYTES);

	arena->ptes = memblock_alloc_from(mem_size, align, 0);

	arena->ptes = memblock_alloc(mem_size, align);



#endif /* CONFIG_DISCONTIGMEM */

arch/alpha/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ move_initrd(unsigned long mem_limit) 
	unsigned long size;



	size = initrd_end - initrd_start;

	start = memblock_alloc_from(PAGE_ALIGN(size), PAGE_SIZE, 0);

	start = memblock_alloc(PAGE_ALIGN(size), PAGE_SIZE);

	if (!start || __pa(start) + size > mem_limit) {

		initrd_start = initrd_end = 0;

		return NULL;

arch/ia64/kernel/mca.c

+1 −2
Original line number Diff line number Diff line
@@ -1835,8 +1835,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset, 
/* Caller prevents this from being called after init */

static void * __ref mca_bootmem(void)

{

	return memblock_alloc_from(sizeof(struct ia64_mca_cpu),

				   KERNEL_STACK_SIZE, 0);

	return memblock_alloc(sizeof(struct ia64_mca_cpu), KERNEL_STACK_SIZE);

}



/* Do per-CPU MCA-related initialization.  */

arch/mips/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ void __init trap_init(void) 
		phys_addr_t ebase_pa;



		ebase = (unsigned long)

			memblock_alloc_from(size, 1 << fls(size), 0);

			memblock_alloc(size, 1 << fls(size));



		/*

		 * Try to ensure ebase resides in KSeg0 if possible.