From cd68b0fa4a5bc38ce61616434064c8efa1fa6229 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 19 Jul 2007 01:49:08 -0700
Subject: [PATCH] --- yaml --- r: 61646 b: refs/heads/master c:
 3abf7afd406866a84276d3ed04f4edf6070c9cb5 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9586aa8bfb88..f88ccb752bc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd00cc486ab1c17049a535413d1751ef3482141c
+refs/heads/master: 3abf7afd406866a84276d3ed04f4edf6070c9cb5
diff --git a/trunk/mm/hugetlb.c b/trunk/mm/hugetlb.c
index c4a573b857bd..15fc7b000772 100644
--- a/trunk/mm/hugetlb.c
+++ b/trunk/mm/hugetlb.c
@@ -78,16 +78,13 @@ static struct page *dequeue_huge_page(struct vm_area_struct *vma,
 	for (z = zonelist->zones; *z; z++) {
 		nid = zone_to_nid(*z);
 		if (cpuset_zone_allowed_softwall(*z, htlb_alloc_mask) &&
-		    !list_empty(&hugepage_freelists[nid]))
-			break;
-	}
-
-	if (*z) {
-		page = list_entry(hugepage_freelists[nid].next,
-				  struct page, lru);
-		list_del(&page->lru);
-		free_huge_pages--;
-		free_huge_pages_node[nid]--;
+		    !list_empty(&hugepage_freelists[nid])) {
+			page = list_entry(hugepage_freelists[nid].next,
+					  struct page, lru);
+			list_del(&page->lru);
+			free_huge_pages--;
+			free_huge_pages_node[nid]--;
+		}
 	}
 	return page;
 }