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

Commit 74768ed8 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

page allocator: use no-panic variant of alloc_bootmem() in alloc_large_system_hash() 



..  since a failed allocation is being (initially) handled gracefully, and
panic()-ed upon failure explicitly in the function if retries with smaller
sizes failed.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 866c3663

include/linux/bootmem.h

+4 −0
Original line number Diff line number Diff line
@@ -97,10 +97,14 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 
#ifndef CONFIG_HAVE_ARCH_BOOTMEM_NODE

#define alloc_bootmem(x) \

	__alloc_bootmem(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_nopanic(x) \

	__alloc_bootmem_nopanic(x, SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low(x) \

	__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)

#define alloc_bootmem_pages(x) \

	__alloc_bootmem(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_pages_nopanic(x) \

	__alloc_bootmem_nopanic(x, PAGE_SIZE, __pa(MAX_DMA_ADDRESS))

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#define alloc_bootmem_node(pgdat, x) \

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -4437,7 +4437,7 @@ void *__init alloc_large_system_hash(const char *tablename, 
	do {

		size = bucketsize << log2qty;

		if (flags & HASH_EARLY)

			table = alloc_bootmem(size);

			table = alloc_bootmem_nopanic(size);

		else if (hashdist)

			table = __vmalloc(size, GFP_ATOMIC, PAGE_KERNEL);

		else {