summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@csgroup.eu>2021-01-20 07:49:13 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-04 10:26:31 +0100
commitc4c70ac4659e3a0cf06755a2d41cfa848c5cec8b (patch)
treec31d687ce62ca10b66f74da6f32e1449f04019c2
parent8121f35cc657ab569fdebdfe94ecb9d345bfb89d (diff)
downloadlinux-stable-c4c70ac4659e3a0cf06755a2d41cfa848c5cec8b.tar.gz
linux-stable-c4c70ac4659e3a0cf06755a2d41cfa848c5cec8b.tar.bz2
linux-stable-c4c70ac4659e3a0cf06755a2d41cfa848c5cec8b.zip
powerpc/47x: Disable 256k page size
[ Upstream commit 910a0cb6d259736a0c86e795d4c2f42af8d0d775 ] PPC47x_TLBE_SIZE isn't defined for 256k pages, leading to a build break if 256k pages is selected. So change the kconfig so that 256k pages can't be selected for 47x. Fixes: e7f75ad01d59 ("powerpc/47x: Base ppc476 support") Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> [mpe: Expand change log to mention build break] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/2fed79b1154c872194f98bac4422c23918325e61.1611128938.git.christophe.leroy@csgroup.eu Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--arch/powerpc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cb285e474c88..c4cbb65e742f 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -723,7 +723,7 @@ config PPC_64K_PAGES
config PPC_256K_PAGES
bool "256k page size"
- depends on 44x && !STDBINUTILS
+ depends on 44x && !STDBINUTILS && !PPC_47x
help
Make the page size 256k.