Pull powerpc fix from Michael Ellerman: "One fix from Paul: we can not use the radix MMU under a hypervisor for now. Although the code checked if the processor supports radix, that is not sufficient" * tag 'powerpc-4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/64: Disable use of radix under a hypervisor
Unified · Split
| @@ -347,7 +347,8 @@ early_param("disable_radix", parse_disable_radix); · 346 unmodified lines | |||
| 347 | void __init mmu_early_init_devtree(void) | 347 | void __init mmu_early_init_devtree(void) |
| 348 | { | 348 | { |
| 349 | /* Disable radix mode based on kernel command line. */ | 349 | /* Disable radix mode based on kernel command line. */ |
| 350 | if (disable_radix) | 350 | /* We don't yet have the machinery to do radix as a guest. */ |
| 351 | if (disable_radix || !(mfmsr() & MSR_HV)) | ||
| 351 | cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; | 352 | cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; |
| 352 | 353 | ||
| 353 | if (early_radix_enabled()) | 354 | if (early_radix_enabled()) |