diff options
author | Yinghai Lu <yinghai@kernel.org> | 2013-01-24 12:20:15 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-01-29 19:32:59 -0800 |
commit | 38fa4175e60d98fb1c9815fb14f8057576dade73 (patch) | |
tree | 37472101af7cc4ed35b11b414a0ea8f9ac1d81db /include/linux/bootmem.h | |
parent | 8b78c21d72d9dbcb7230e97423a2cd8d8402c20c (diff) | |
download | linux-stable-38fa4175e60d98fb1c9815fb14f8057576dade73.tar.gz linux-stable-38fa4175e60d98fb1c9815fb14f8057576dade73.tar.bz2 linux-stable-38fa4175e60d98fb1c9815fb14f8057576dade73.zip |
mm: Add alloc_bootmem_low_pages_nopanic()
We don't need to panic in some case, like for swiotlb preallocating.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1359058816-7615-35-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'include/linux/bootmem.h')
-rw-r--r-- | include/linux/bootmem.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 3f778c27f825..3cd16ba82f15 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -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) \ |