Merge branch 'linux-2.6'

1 files changed, 3 insertions, 1 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index de4cf458d6e1..84c795ee2d65 100644
--- 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;
+        struct mempolicy *mpol;
         struct zonelist *zonelist = huge_zonelist(vma, address,
-                                                htlb_alloc_mask);
+                                        htlb_alloc_mask, &mpol);
         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;
                 }
         }
+        mpol_free(mpol);        /* unref if mpol !NULL */
         return page;
 }