aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bootmem.h
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2013-01-24 15:20:15 -0500
committerH. Peter Anvin <hpa@linux.intel.com>2013-01-29 22:32:59 -0500
commit38fa4175e60d98fb1c9815fb14f8057576dade73 (patch)
tree37472101af7cc4ed35b11b414a0ea8f9ac1d81db /include/linux/bootmem.h
parent8b78c21d72d9dbcb7230e97423a2cd8d8402c20c (diff)
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.h5
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,
99extern void *__alloc_bootmem_low(unsigned long size, 99extern void *__alloc_bootmem_low(unsigned long size,
100 unsigned long align, 100 unsigned long align,
101 unsigned long goal); 101 unsigned long goal);
102void *__alloc_bootmem_low_nopanic(unsigned long size,
103 unsigned long align,
104 unsigned long goal);
102extern void *__alloc_bootmem_low_node(pg_data_t *pgdat, 105extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
103 unsigned long size, 106 unsigned long size,
104 unsigned long align, 107 unsigned long align,
@@ -132,6 +135,8 @@ extern void *__alloc_bootmem_low_node(pg_data_t *pgdat,
132 135
133#define alloc_bootmem_low(x) \ 136#define alloc_bootmem_low(x) \
134 __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0) 137 __alloc_bootmem_low(x, SMP_CACHE_BYTES, 0)
138#define alloc_bootmem_low_pages_nopanic(x) \
139 __alloc_bootmem_low_nopanic(x, PAGE_SIZE, 0)
135#define alloc_bootmem_low_pages(x) \ 140#define alloc_bootmem_low_pages(x) \
136 __alloc_bootmem_low(x, PAGE_SIZE, 0) 141 __alloc_bootmem_low(x, PAGE_SIZE, 0)
137#define alloc_bootmem_low_pages_node(pgdat, x) \ 142#define alloc_bootmem_low_pages_node(pgdat, x) \