diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-21 06:56:52 -0800 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-21 06:56:52 -0800 |
| commit | e7e37ee9c547213d726b29c2510cbb6696050405 (patch) | |
| tree | 50c45625de666b23f209d79eb1bfae05c64feee9 /include/asm-powerpc/page_64.h | |
| parent | c243f1f1f6545985afcc6adf1fc085729029c3ee (diff) | |
| parent | db93a82fa9d8b4d6e31c227922eaae829253bb88 (diff) | |
| download | linux-stable-e7e37ee9c547213d726b29c2510cbb6696050405.tar.gz | |
Merge ../linus/
Diffstat (limited to 'include/asm-powerpc/page_64.h')
| -rw-r--r-- | include/asm-powerpc/page_64.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-powerpc/page_64.h b/include/asm-powerpc/page_64.h index c16f106b5373..1e6e7846824f 100644 --- a/include/asm-powerpc/page_64.h +++ b/include/asm-powerpc/page_64.h @@ -86,7 +86,11 @@ static inline void copy_page(void *to, void *from) extern u64 ppc64_pft_size; /* Large pages size */ +#ifdef CONFIG_HUGETLB_PAGE extern unsigned int HPAGE_SHIFT; +#else +#define HPAGE_SHIFT PAGE_SHIFT +#endif #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT) #define HPAGE_MASK (~(HPAGE_SIZE - 1)) #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT) |