]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc: Make PPC_64K_PAGES depend on only 44x or PPC_BOOK3S_64
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 8 Feb 2019 12:34:16 +0000 (23:34 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 21 Feb 2019 13:10:15 +0000 (00:10 +1100)
commitc5104131534d1e177b115aa91858ea3c8cadc9c4
tree477a1f6b580a1db67889f62e07e155f1a081b5a8
parente4f2a3e0c9d74e44e54fc225d928d27668906ce1
powerpc: Make PPC_64K_PAGES depend on only 44x or PPC_BOOK3S_64

In commit 3675c6d516e9 ("powerpc/mm/book3e/64: Remove unsupported
64Kpage size from 64bit booke") we dropped the 64K page size support
from the 64-bit nohash (Book3E) code.

But we didn't update the dependencies of the PPC_64K_PAGES option,
meaning a randconfig can still trigger this code and cause a build
breakage, eg:
  arch/powerpc/include/asm/nohash/64/pgtable.h:14:2: error: #error "Page size not supported"
  arch/powerpc/include/asm/nohash/mmu-book3e.h:275:2: error: #error Unsupported page size

So remove PPC_BOOK3E_64 from the dependencies. This also means we
don't need to worry about PPC_FSL_BOOK3E, because that was just trying
to prevent the PPC_BOOK3E_64=y && PPC_FSL_BOOK3E=y case.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/Kconfig