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

Commit b54bbf7b authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

mm: introduce non panic alloc_bootmem 



Straight forward variant of the existing __alloc_bootmem_node, only
subsequent patch when allocating giant hugepages at boot -- don't want to
panic if we can't allocate as many as the user asked for.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5ced66c9

include/linux/bootmem.h

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ extern void *__alloc_bootmem_node(pg_data_t *pgdat, 
				  unsigned long size,

				  unsigned long align,

				  unsigned long goal);

extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat,

				  unsigned long size,

				  unsigned long align,

				  unsigned long goal);

extern unsigned long init_bootmem_node(pg_data_t *pgdat,

				       unsigned long freepfn,

				       unsigned long startpfn,

mm/bootmem.c

+12 −0
Original line number Diff line number Diff line
@@ -578,6 +578,18 @@ void * __init alloc_bootmem_section(unsigned long size, 
}

#endif



void * __init __alloc_bootmem_node_nopanic(pg_data_t *pgdat, unsigned long size,

				   unsigned long align, unsigned long goal)

{

	void *ptr;



	ptr = alloc_bootmem_core(pgdat->bdata, size, align, goal, 0);

	if (ptr)

		return ptr;



	return __alloc_bootmem_nopanic(size, align, goal);

}



#ifndef ARCH_LOW_ADDRESS_LIMIT

#define ARCH_LOW_ADDRESS_LIMIT	0xffffffffUL

#endif