mm: introduce non panic alloc_bootmem

[linux-2.6-omap-h63xx.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 4bc6ae2fbaa362ae55d59c778bfe7ee5cf1fe5b9..9ac972535fff4956bf10edb98118fc3b8b375bc8 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -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