diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 414b978b8010b0cbac4511b606ee16c1a5236cc8..b9fc064d38d281f1c32584e79edd705c670b1731 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -859,6 +859,7 @@ config THREAD_SHIFT
 	int "Thread shift" if EXPERT
 	range 13 15
 	default "15" if PPC_256K_PAGES
+	default "15" if PPC_PSERIES || PPC_POWERNV
 	default "14" if PPC64
 	default "13"
 	help