diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-17 16:39:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-17 16:39:52 -0400 |
| commit | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (patch) | |
| tree | 109f3c3379e55948e4dea344a4d0ea59bd321f9d | |
| parent | c58afec8b2576b121eced7b94eb94eaf4626bacc (diff) | |
| parent | 87c62a66edd645a9b1ff1f9b00ab20c5a93d8845 (diff) | |
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
| -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 @@ | |||
| 32 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | 32 | #define PAGE_SIZE (1UL << PAGE_SHIFT) |
| 33 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) | 33 | #define PAGE_MASK (~((1 << PAGE_SHIFT) - 1)) |
| 34 | 34 | ||
| 35 | #ifdef CONFIG_HUGETLB_PAGE | ||
| 35 | #define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3) | 36 | #define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3) |
| 36 | #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) | 37 | #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) |
| 37 | #define HPAGE_MASK (~(HPAGE_SIZE - 1)) | 38 | #define HPAGE_MASK (~(HPAGE_SIZE - 1)) |
| 38 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) | 39 | #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) |
| 40 | #endif /* CONFIG_HUGETLB_PAGE */ | ||
| 39 | 41 | ||
| 40 | #ifndef __ASSEMBLY__ | 42 | #ifndef __ASSEMBLY__ |
| 41 | 43 | ||