commit df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb
author Linus Torvalds <torvalds@linux-foundation.org> Mon Aug 17 13:39:52 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Aug 17 13:39:52 2009 -0700
tree 109f3c3379e55948e4dea344a4d0ea59bd321f9d
parent c58afec8b2576b121eced7b94eb94eaf4626bacc
parent 87c62a66edd645a9b1ff1f9b00ab20c5a93d8845

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix HPAGE_SIZE redefinition

arch/mips/include/asm/page.h

diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
index 96a14a4..4320239 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -32,10 +32,12 @@
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK       (~((1 << PAGE_SHIFT) - 1))
 
+#ifdef CONFIG_HUGETLB_PAGE
 #define HPAGE_SHIFT	(PAGE_SHIFT + PAGE_SHIFT - 3)
 #define HPAGE_SIZE	((1UL) << HPAGE_SHIFT)
 #define HPAGE_MASK	(~(HPAGE_SIZE - 1))
 #define HUGETLB_PAGE_ORDER	(HPAGE_SHIFT - PAGE_SHIFT)
+#endif /* CONFIG_HUGETLB_PAGE */
 
 #ifndef __ASSEMBLY__