Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / arch / powerpc / include / asm / thread_info.h

diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 6fc6464f7421ad519a1c10a41c9acde5749ef578..a941cc6fc3e96c03a6b44861fa7cd86cdee26c3c 100644 (file)
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -10,15 +10,7 @@
 
 #ifdef __KERNEL__
 
-/* We have 8k stacks on ppc32 and 16k on ppc64 */
-
-#if defined(CONFIG_PPC64)
-#define THREAD_SHIFT           14
-#elif defined(CONFIG_PPC_256K_PAGES)
-#define THREAD_SHIFT           15
-#else
-#define THREAD_SHIFT           13
-#endif
+#define THREAD_SHIFT           CONFIG_THREAD_SHIFT
 
 #define THREAD_SIZE            (1 << THREAD_SHIFT)