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

Commit 26fb3dae authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: drop memblock_alloc_*_nopanic() variants 

As all the memblock allocation functions return NULL in case of error
rather than panic(), the duplicates with _nopanic suffix can be removed.

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


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Petr Mladek <pmladek@suse.com>		[printk]
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: 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: Paul Burton <paul.burton@mips.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 c0dbe825

arch/arc/kernel/unwind.c

+1 −2
Original line number Diff line number Diff line
@@ -181,8 +181,7 @@ static void init_unwind_hdr(struct unwind_table *table, 
 */

static void *__init unw_hdr_alloc_early(unsigned long sz)

{

	return memblock_alloc_from_nopanic(sz, sizeof(unsigned int),

					   MAX_DMA_ADDRESS);

	return memblock_alloc_from(sz, sizeof(unsigned int), MAX_DMA_ADDRESS);

}



static void *unw_hdr_alloc(unsigned long sz)

arch/sh/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ void __init allocate_pgdat(unsigned int nid) 
	get_pfn_range_for_nid(nid, &start_pfn, &end_pfn);



#ifdef CONFIG_NEED_MULTIPLE_NODES

	NODE_DATA(nid) = memblock_alloc_try_nid_nopanic(

	NODE_DATA(nid) = memblock_alloc_try_nid(

				sizeof(struct pglist_data),

				SMP_CACHE_BYTES, MEMBLOCK_LOW_LIMIT,

				MEMBLOCK_ALLOC_ACCESSIBLE, nid);

arch/x86/kernel/setup_percpu.c

+5 −5
Original line number Diff line number Diff line
@@ -106,13 +106,13 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, 
	void *ptr;



	if (!node_online(node) || !NODE_DATA(node)) {

		ptr = memblock_alloc_from_nopanic(size, align, goal);

		ptr = memblock_alloc_from(size, align, goal);

		pr_info("cpu %d has no node %d or node-local memory\n",

			cpu, node);

		pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n",

			 cpu, size, __pa(ptr));

	} else {

		ptr = memblock_alloc_try_nid_nopanic(size, align, goal,

		ptr = memblock_alloc_try_nid(size, align, goal,

					     MEMBLOCK_ALLOC_ACCESSIBLE,

					     node);
@@ -121,7 +121,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, 
	}

	return ptr;

#else

	return memblock_alloc_from_nopanic(size, align, goal);

	return memblock_alloc_from(size, align, goal);

#endif

}

arch/x86/mm/kasan_init_64.c

+8 −6
Original line number Diff line number Diff line
@@ -24,14 +24,16 @@ extern struct range pfn_mapped[E820_MAX_ENTRIES]; 


static p4d_t tmp_p4d_table[MAX_PTRS_PER_P4D] __initdata __aligned(PAGE_SIZE);



static __init void *early_alloc(size_t size, int nid, bool panic)

static __init void *early_alloc(size_t size, int nid, bool should_panic)

{

	if (panic)

		return memblock_alloc_try_nid(size, size,

			__pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);

	else

		return memblock_alloc_try_nid_nopanic(size, size,

	void *ptr = memblock_alloc_try_nid(size, size,

			__pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);



	if (!ptr && should_panic)

		panic("%pS: Failed to allocate page, nid=%d from=%lx\n",

		      (void *)_RET_IP_, nid, __pa(MAX_DMA_ADDRESS));



	return ptr;

}



static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr,

drivers/firmware/memmap.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type) 
{

	struct firmware_map_entry *entry;



	entry = memblock_alloc_nopanic(sizeof(struct firmware_map_entry),

	entry = memblock_alloc(sizeof(struct firmware_map_entry),

			       SMP_CACHE_BYTES);

	if (WARN_ON(!entry))

		return -ENOMEM;