diff options
| author | Alexey Kardashevskiy <aik@ozlabs.ru> | 2018-01-09 16:45:20 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-27 23:44:55 +1100 |
| commit | 79b4686857029cdea97d0102d179aef2f58e5acb (patch) | |
| tree | c78ee3de344bfa3df8e72cb3e0543ee921144c38 | |
| parent | bde709a70884bfc790da6fbc4467c91e8d41c51b (diff) | |
| download | linux-stable-79b4686857029cdea97d0102d179aef2f58e5acb.tar.gz linux-stable-79b4686857029cdea97d0102d179aef2f58e5acb.tar.bz2 linux-stable-79b4686857029cdea97d0102d179aef2f58e5acb.zip | |
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>
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index d22c41c26bb3..8ca3f4c915e3 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -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); |