From ce1b80015fffa86bd2b350161739ab564c267cde Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 18 Nov 2005 01:11:02 -0800 Subject: [PATCH] --- yaml --- r: 14409 b: refs/heads/master c: b50ce2324cecf4efc7babe31f4aa1a07f9157317 h: refs/heads/master i: 14407: eac619612b8d2e6acdd5e22bf9da983df8d631c2 v: v3 --- [refs] | 2 +- trunk/include/asm-powerpc/page_64.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 07a44dfbbb3d..e9bbf5e32c7d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c0e485216de80046dd0d448b7cd530dbfc31402f +refs/heads/master: b50ce2324cecf4efc7babe31f4aa1a07f9157317 diff --git a/trunk/include/asm-powerpc/page_64.h b/trunk/include/asm-powerpc/page_64.h index c16f106b5373..1e6e7846824f 100644 --- a/trunk/include/asm-powerpc/page_64.h +++ b/trunk/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)