Commit aea47ff3 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
parent 45b07ef3
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/nodemask.h> #include <linux/nodemask.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/mempolicy.h> #include <linux/mempolicy.h>
#include <linux/cpuset.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
...@@ -48,7 +49,8 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma, ...@@ -48,7 +49,8 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
for (z = zonelist->zones; *z; z++) { for (z = zonelist->zones; *z; z++) {
nid = (*z)->zone_pgdat->node_id; nid = (*z)->zone_pgdat->node_id;
if (!list_empty(&hugepage_freelists[nid])) if (cpuset_zone_allowed(*z, GFP_HIGHUSER) &&
!list_empty(&hugepage_freelists[nid]))
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment