From 3d4ef17fcdbeed54a2baa4d707d0181b2abc147c Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 26 Mar 2008 21:03:04 -0700
Subject: [PATCH] --- yaml --- r: 87870 b: refs/heads/master c:
 25e59881f109dc6378ebc463ae4c2de907435de3 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/mm/hugetlbpage.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 205fe2a120dd..3e79ce712bff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2ef749720a97053d60605a7456772a1752164cc
+refs/heads/master: 25e59881f109dc6378ebc463ae4c2de907435de3
diff --git a/trunk/arch/x86/mm/hugetlbpage.c b/trunk/arch/x86/mm/hugetlbpage.c
index 4fbafb4bc2f0..0b3d567e686d 100644
--- a/trunk/arch/x86/mm/hugetlbpage.c
+++ b/trunk/arch/x86/mm/hugetlbpage.c
@@ -178,7 +178,7 @@ follow_huge_addr(struct mm_struct *mm, unsigned long address, int write)
 
 	page = &pte_page(*pte)[vpfn % (HPAGE_SIZE/PAGE_SIZE)];
 
-	WARN_ON(!PageCompound(page));
+	WARN_ON(!PageHead(page));
 
 	return page;
 }