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

Commit 27f574c2 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

memblock: Expose MEMBLOCK_ALLOC_ANYWHERE 



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

arch/powerpc/mm/hash_utils_64.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void __init htab_initialize(void) 
		if (machine_is(cell))

			limit = 0x80000000;

		else

			limit = 0;

			limit = MEMBLOCK_ALLOC_ANYWHERE;



		table = memblock_alloc_base(htab_size_bytes, htab_size_bytes, limit);

include/linux/memblock.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ extern u64 __init memblock_alloc_nid(u64 size, u64 align, int nid); 
extern u64 __init memblock_alloc(u64 size, u64 align);

extern u64 __init memblock_alloc_base(u64 size,

		u64, u64 max_addr);

#define MEMBLOCK_ALLOC_ANYWHERE	0

extern u64 __init __memblock_alloc_base(u64 size,

		u64 align, u64 max_addr);

extern u64 __init memblock_phys_mem_size(void);

mm/memblock.c

+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ 
#include <linux/bitops.h>

#include <linux/memblock.h>



#define MEMBLOCK_ALLOC_ANYWHERE	0



struct memblock memblock;



static int memblock_debug;