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

Commit 38fa4175 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

mm: Add alloc_bootmem_low_pages_nopanic() 



We don't need to panic in some case, like for swiotlb preallocating.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-35-git-send-email-yinghai@kernel.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent 8b78c21d

include/linux/bootmem.h

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ void *___alloc_bootmem_node_nopanic(pg_data_t *pgdat, 
extern void *__alloc_bootmem_low(unsigned long size,

				 unsigned long align,

				 unsigned long goal);

void *__alloc_bootmem_low_nopanic(unsigned long size,

				 unsigned long align,

				 unsigned long goal);

extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,

				      unsigned long size,

				      unsigned long align,
@@ -132,6 +135,8 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 


#define alloc_bootmem_low(x) \

	__alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)

#define alloc_bootmem_low_pages_nopanic(x) \

	__alloc_bootmem_low_nopanic(x, PAGE_SIZE, 0)

#define alloc_bootmem_low_pages(x) \

	__alloc_bootmem_low(x, PAGE_SIZE, 0)

#define alloc_bootmem_low_pages_node(pgdat, x) \

mm/bootmem.c

+8 −0
Original line number Diff line number Diff line
@@ -833,6 +833,14 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, 
	return ___alloc_bootmem(size, align, goal, ARCH_LOW_ADDRESS_LIMIT);

}



void * __init __alloc_bootmem_low_nopanic(unsigned long size,

					  unsigned long align,

					  unsigned long goal)

{

	return ___alloc_bootmem_nopanic(size, align, goal,

					ARCH_LOW_ADDRESS_LIMIT);

}



/**

 * __alloc_bootmem_low_node - allocate low boot memory from a specific node

 * @pgdat: node to allocate from

mm/nobootmem.c

+8 −0
Original line number Diff line number Diff line
@@ -391,6 +391,14 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, 
	return ___alloc_bootmem(size, align, goal, ARCH_LOW_ADDRESS_LIMIT);

}



void * __init __alloc_bootmem_low_nopanic(unsigned long size,

					  unsigned long align,

					  unsigned long goal)

{

	return ___alloc_bootmem_nopanic(size, align, goal,

					ARCH_LOW_ADDRESS_LIMIT);

}



/**

 * __alloc_bootmem_low_node - allocate low boot memory from a specific node

 * @pgdat: node to allocate from