mm: allow PF_MEMALLOC from softirq context

[deliverable/linux.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 73096630cb35ac4d04209251f5cfba77f0c765ed..bcb63ac48cc5e0d20eb7d1359b8d6d79a7358ac0 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -710,6 +710,10 @@ again:
        if (ptr)
                return ptr;
 
+       /* do not panic in alloc_bootmem_bdata() */
+       if (limit && goal + size > limit)
+               limit = 0;
+
        ptr = alloc_bootmem_bdata(pgdat->bdata, size, align, goal, limit);
        if (ptr)
                return ptr;