diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-03 13:30:03 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-03 13:30:03 +1100 |
commit | 652e8f8d579d61745094e36b4ff085026a332e73 (patch) | |
tree | 44145576f9cdf0b777dee0d0961f5499ea88bec8 /arch/powerpc/include/asm/page.h | |
parent | 501cb16d3cfdcca99ac26fe122079f2a43b046b8 (diff) | |
parent | 6c7120902305b3a21460cd2f0f917a39307df566 (diff) |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/page.h')
-rw-r--r-- | arch/powerpc/include/asm/page.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 197d569f5bd..32cbf16f10e 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -19,12 +19,14 @@ #include <asm/kdump.h> /* - * On regular PPC32 page size is 4K (but we support 4K/16K/64K pages + * On regular PPC32 page size is 4K (but we support 4K/16K/64K/256K pages * on PPC44x). For PPC64 we support either 4K or 64K software * page size. When using 64K pages however, whether we are really supporting * 64K pages in HW or not is irrelevant to those definitions. */ -#if defined(CONFIG_PPC_64K_PAGES) +#if defined(CONFIG_PPC_256K_PAGES) +#define PAGE_SHIFT 18 +#elif defined(CONFIG_PPC_64K_PAGES) #define PAGE_SHIFT 16 #elif defined(CONFIG_PPC_16K_PAGES) #define PAGE_SHIFT 14 |