Commit 25818f0f authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock: Make MEMBLOCK_ERROR be 0 



And ensure we don't hand out 0 as a valid allocation. We put the
low limit at PAGE_SIZE arbitrarily.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 37d8d4bf

include/linux/memblock.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <asm/memblock.h>



#define INIT_MEMBLOCK_REGIONS	128

#define MEMBLOCK_ERROR		(~(phys_addr_t)0)

#define MEMBLOCK_ERROR		0



struct memblock_region {

	phys_addr_t base;

mm/memblock.c

+6 −0
Original line number Diff line number Diff line
@@ -105,6 +105,12 @@ static phys_addr_t __init memblock_find_region(phys_addr_t start, phys_addr_t en 
	phys_addr_t base, res_base;

	long j;



	/* Prevent allocations returning 0 as it's also used to

	 * indicate an allocation failure

	 */

	if (start == 0)

		start = PAGE_SIZE;



	base = memblock_align_down((end - size), align);

	while (start <= base) {

		j = memblock_overlaps_region(&memblock.reserved, base, size);