summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-17 13:39:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-17 13:39:52 -0700
commitdf4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (patch)
tree109f3c3379e55948e4dea344a4d0ea59bd321f9d /arch
parentc58afec8b2576b121eced7b94eb94eaf4626bacc (diff)
parent87c62a66edd645a9b1ff1f9b00ab20c5a93d8845 (diff)
downloadop-kernel-dev-df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb.zip
op-kernel-dev-df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb.tar.gz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/include/asm/page.h2
1 files changed, 2 insertions, 0 deletions
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__
OpenPOWER on IntegriCloud