diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-02 21:30:03 -0500 |
| commit | 652e8f8d579d61745094e36b4ff085026a332e73 (patch) | |
| tree | 44145576f9cdf0b777dee0d0961f5499ea88bec8 /arch/powerpc/include/asm/thread_info.h | |
| parent | 501cb16d3cfdcca99ac26fe122079f2a43b046b8 (diff) | |
| parent | 6c7120902305b3a21460cd2f0f917a39307df566 (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/include/asm/thread_info.h')
| -rw-r--r-- | arch/powerpc/include/asm/thread_info.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index 995ab7b80f6..9aba5a38a7c 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h | |||
| @@ -12,8 +12,10 @@ | |||
| 12 | 12 | ||
| 13 | /* We have 8k stacks on ppc32 and 16k on ppc64 */ | 13 | /* We have 8k stacks on ppc32 and 16k on ppc64 */ |
| 14 | 14 | ||
| 15 | #ifdef CONFIG_PPC64 | 15 | #if defined(CONFIG_PPC64) |
| 16 | #define THREAD_SHIFT 14 | 16 | #define THREAD_SHIFT 14 |
| 17 | #elif defined(CONFIG_PPC_256K_PAGES) | ||
| 18 | #define THREAD_SHIFT 15 | ||
| 17 | #else | 19 | #else |
| 18 | #define THREAD_SHIFT 13 | 20 | #define THREAD_SHIFT 13 |
| 19 | #endif | 21 | #endif |