diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:04:07 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-08-23 18:04:07 +0900 |
commit | c3144fc46f987413df10e83659f0bf1aad76f79e (patch) | |
tree | a09f3c13c32664a617d3981ae111436c3127ccc3 /arch/mips/include/asm/page.h | |
parent | sh: unwinder: cacheline align slab cache objects. (diff) | |
parent | sh: drop static UIO clocks for sh7722, sh7723 and sh7724 (diff) | |
download | linux-dev-c3144fc46f987413df10e83659f0bf1aad76f79e.tar.xz linux-dev-c3144fc46f987413df10e83659f0bf1aad76f79e.zip |
Merge branches 'sh/hwblk' and 'sh/pm-runtime'
Diffstat (limited to 'arch/mips/include/asm/page.h')
-rw-r--r-- | arch/mips/include/asm/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index 96a14a426a7c..4320239cf4ef 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__ |