From a773cfe8575ad0a46aaf0c8e552a2d63c1a5a446 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Sat, 19 Nov 2011 02:33:57 -0800
Subject: [PATCH] --- yaml --- r: 275613 b: refs/heads/master c:
 a5c86e986f0b2fe779f13cf53ce6e9f467b03950 h: refs/heads/master i:   275611:
 b84fdab376447d9b152df6839a212ce783b8548d v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/hugetlb.h | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 58ca4ceb8672..524e52fb72cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 208f6f6068836e10d526e87fef6ca4364f4ec068
+refs/heads/master: a5c86e986f0b2fe779f13cf53ce6e9f467b03950
diff --git a/trunk/include/linux/hugetlb.h b/trunk/include/linux/hugetlb.h
index 19644e0016bd..d9d6c868b86b 100644
--- a/trunk/include/linux/hugetlb.h
+++ b/trunk/include/linux/hugetlb.h
@@ -110,11 +110,6 @@ static inline void copy_huge_page(struct page *dst, struct page *src)
 
 #define hugetlb_change_protection(vma, address, end, newprot)
 
-#ifndef HPAGE_MASK
-#define HPAGE_MASK	PAGE_MASK		/* Keep the compiler happy */
-#define HPAGE_SIZE	PAGE_SIZE
-#endif
-
 #endif /* !CONFIG_HUGETLB_PAGE */
 
 #define HUGETLB_ANON_FILE "anon_hugepage"