lib/radix-tree.c: make radix_tree_node_alloc() work correctly within interrupt

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 9d77863..0472964 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1196,12 +1196,14 @@ static struct page *new_vma_page(struct page *page, unsigned long private, int *
                        break;
                vma = vma->vm_next;
        }
+       /*
+        * queue_pages_range() confirms that @page belongs to some vma,
+        * so vma shouldn't be NULL.
+        */
+       BUG_ON(!vma);
 
        if (PageHuge(page))
                return alloc_huge_page_noerr(vma, address, 1);
-       /*
-        * if !vma, alloc_page_vma() will use task or system default policy
-        */
        return alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, address);
 }
 #else