Fix NUMA Memory Policy Reference Counting

[sfrench/cifs-2.6.git] / mm / hugetlb.c

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index de4cf458d6e1979432aad46613d0816146347fc1..84c795ee2d650f807223c3f17a072c3f2eb52c72 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -71,8 +71,9 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 {
        int nid;
        struct page *page = NULL;
 {
        int nid;
        struct page *page = NULL;

+       struct mempolicy *mpol;

        struct zonelist *zonelist = huge_zonelist(vma, address,
        struct zonelist *zonelist = huge_zonelist(vma, address,

-                                               htlb_alloc_mask);
+                                       htlb_alloc_mask, &mpol);

        struct zone **z;
 
        for (z = zonelist->zones; *z; z++) {
        struct zone **z;
 
        for (z = zonelist->zones; *z; z++) {


@@ -87,6 +88,7 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
                        break;
                }
        }
                        break;
                }
        }

+       mpol_free(mpol);        /* unref if mpol !NULL */

        return page;
 }
 
        return page;
 }