Pull bugzilla-5737 into release branch

[pandora-kernel.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index b55bd39..d213fed 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -33,6 +33,7 @@ EXPORT_SYMBOL(max_pfn);               /* This is exported so
                                 * dma_get_required_mask(), which uses
                                 * it, can be an inline function */
 
+static LIST_HEAD(bdata_list);
 #ifdef CONFIG_CRASH_DUMP
 /*
  * If we have booted due to a crash, max_pfn will be a very low value. We need
@@ -52,6 +53,27 @@ unsigned long __init bootmem_bootmap_pages (unsigned long pages)
 
        return mapsize;
 }
+/*
+ * link bdata in order
+ */
+static void link_bootmem(bootmem_data_t *bdata)
+{
+       bootmem_data_t *ent;
+       if (list_empty(&bdata_list)) {
+               list_add(&bdata->list, &bdata_list);
+               return;
+       }
+       /* insert in order */
+       list_for_each_entry(ent, &bdata_list, list) {
+               if (bdata->node_boot_start < ent->node_boot_start) {
+                       list_add_tail(&bdata->list, &ent->list);
+                       return;
+               }
+       }
+       list_add_tail(&bdata->list, &bdata_list);
+       return;
+}
+
 
 /*
  * Called once to set up the allocator itself.
@@ -62,13 +84,11 @@ static unsigned long __init init_bootmem_core (pg_data_t *pgdat,
        bootmem_data_t *bdata = pgdat->bdata;
        unsigned long mapsize = ((end - start)+7)/8;
 
-       pgdat->pgdat_next = pgdat_list;
-       pgdat_list = pgdat;
-
        mapsize = ALIGN(mapsize, sizeof(long));
        bdata->node_bootmem_map = phys_to_virt(mapstart << PAGE_SHIFT);
        bdata->node_boot_start = (start << PAGE_SHIFT);
        bdata->node_low_pfn = end;
+       link_bootmem(bdata);
 
        /*
         * Initially all pages are reserved - setup_arch() has to
@@ -381,16 +401,22 @@ 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)
 {
-       pg_data_t *pgdat = pgdat_list;
+       bootmem_data_t *bdata;
        void *ptr;
 
-       for_each_pgdat(pgdat)
-               if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,
-                                                align, goal, 0)))
+       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.
         */
@@ -416,11 +442,11 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, unsigne
 
 void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, unsigned long goal)
 {
-       pg_data_t *pgdat = pgdat_list;
+       bootmem_data_t *bdata;
        void *ptr;
 
-       for_each_pgdat(pgdat)
-               if ((ptr = __alloc_bootmem_core(pgdat->bdata, size,
+       list_for_each_entry(bdata, &bdata_list, list)
+               if ((ptr = __alloc_bootmem_core(bdata, size,
                                                 align, goal, LOW32LIMIT)))
                        return(ptr);