Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[powerpc.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index d3e3bd2..50353e0 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -29,9 +29,7 @@ unsigned long max_low_pfn;
 unsigned long min_low_pfn;
 unsigned long max_pfn;
 
-EXPORT_SYMBOL(max_pfn);                /* This is exported so
-                                * dma_get_required_mask(), which uses
-                                * it, can be an inline function */
+EXPORT_UNUSED_SYMBOL(max_pfn);  /*  June 2006  */
 
 static LIST_HEAD(bdata_list);
 #ifdef CONFIG_CRASH_DUMP
@@ -401,7 +399,7 @@ unsigned long __init free_all_bootmem (void)
        return(free_all_bootmem_core(NODE_DATA(0)));
 }
 
-void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)
+void * __init __alloc_bootmem_nopanic(unsigned long size, unsigned long align, unsigned long goal)
 {
        bootmem_data_t *bdata;
        void *ptr;
@@ -409,7 +407,14 @@ void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned
        list_for_each_entry(bdata, &bdata_list, list)
                if ((ptr = __alloc_bootmem_core(bdata, size, align, goal, 0)))
                        return(ptr);
+       return NULL;
+}
 
+void * __init __alloc_bootmem(unsigned long size, unsigned long align, unsigned long goal)
+{
+       void *mem = __alloc_bootmem_nopanic(size,align,goal);
+       if (mem)
+               return mem;
        /*
         * Whoops, we cannot satisfy the allocation request.
         */