powerpc/init: Do not advertise radix during client-architecture-support

Currently the pseries kernel advertises radix MMU support even if
the actual support is disabled via the CONFIG_PPC_RADIX_MMU option.

This adds a check for CONFIG_PPC_RADIX_MMU to avoid advertising radix
to the hypervisor.

Suggested-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Alexey Kardashevskiy 2018-01-09 16:45:20 +11:00 committed by Michael Ellerman
parent bde709a708
commit 79b4686857
1 changed files with 2 additions and 1 deletions

View File

@ -1111,7 +1111,8 @@ static void __init prom_check_platform_support(void)
}
}
if (supported.radix_mmu && supported.radix_gtse) {
if (supported.radix_mmu && supported.radix_gtse &&
IS_ENABLED(CONFIG_PPC_RADIX_MMU)) {
/* Radix preferred - but we require GTSE for now */
prom_debug("Asking for radix with GTSE\n");
ibm_architecture_vec.vec5.mmu = OV5_FEAT(OV5_MMU_RADIX);