aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2008-07-24 00:27:45 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 13:47:17 -0400
commitb54bbf7b81170f03597c17dd0b559e3006bc9868 (patch)
treeabc6b326e293d3a685d943956d32ab4038a90e1f /include/linux
parent5ced66c901f1cf0b684feb15c2cd8b126e263d07 (diff)
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: Andi Kleen <ak@suse.de> Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/bootmem.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h
index dd8fee6c46d9..f352c5f125b4 100644
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -89,6 +89,10 @@ extern void *__alloc_bootmem_node(pg_data_t *pgdat,
89 unsigned long size, 89 unsigned long size,
90 unsigned long align, 90 unsigned long align,
91 unsigned long goal); 91 unsigned long goal);
92extern void *__alloc_bootmem_node_nopanic(pg_data_t *pgdat,
93 unsigned long size,
94 unsigned long align,
95 unsigned long goal);
92extern unsigned long init_bootmem_node(pg_data_t *pgdat, 96extern unsigned long init_bootmem_node(pg_data_t *pgdat,
93 unsigned long freepfn, 97 unsigned long freepfn,
94 unsigned long startpfn, 98 unsigned long startpfn,