]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/47x: Disable 256k page size
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Wed, 20 Jan 2021 07:49:13 +0000 (07:49 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 09:26:31 +0000 (10:26 +0100)
[ 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>
arch/powerpc/Kconfig

index cb285e474c880d72cd6f75acb3c70c1ab68c14ae..c4cbb65e742f42b7f5a6f76a0494f43535ff9d1e 100644 (file)
@@ -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.