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

Commit ab381843 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: bootmem: allocate in order node+goal, goal, node, anywhere 



Match the nobootmem version of __alloc_bootmem_node.  Try to satisfy both
the node and the goal, then just the goal, then just the node, then
allocate anywhere before panicking.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c12ab504

mm/bootmem.c

+13 −1
Original line number Diff line number Diff line
@@ -704,6 +704,7 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, 
{

	void *ptr;



again:

	ptr = alloc_arch_preferred_bootmem(bdata, size, align, goal, limit);

	if (ptr)

		return ptr;
@@ -712,7 +713,18 @@ static void * __init ___alloc_bootmem_node(bootmem_data_t *bdata, 
	if (ptr)

		return ptr;



	return ___alloc_bootmem(size, align, goal, limit);

	ptr = alloc_bootmem_core(size, align, goal, limit);

	if (ptr)

		return ptr;



	if (goal) {

		goal = 0;

		goto again;

	}



	printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);

	panic("Out of memory");

	return NULL;

}



/**