From 5a8666bb7018500a7ebf6b32d8fda2808407a0c8 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@engr.sgi.com>
Date: Sun, 8 Jan 2006 01:00:57 -0800
Subject: [PATCH] --- yaml --- r: 16846 b: refs/heads/master c:
 aea47ff363c15b0be5fc27ed991b1fdee338f0a7 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/hugetlb.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 675086ec0617..ac59cc6a0db9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45b07ef31d1182d2cfde7711327e3afb268bb1ac
+refs/heads/master: aea47ff363c15b0be5fc27ed991b1fdee338f0a7
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index f4c43d7980ba..b21d78c941b5 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -12,6 +12,7 @@
 #include <linux/nodemask.h>
 #include <linux/pagemap.h>
 #include <linux/mempolicy.h>
+#include <linux/cpuset.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -48,7 +49,8 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 
 	for (z = zonelist->zones; *z; z++) {
 		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;
 	}