diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 20:58:32 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 20:58:32 +0300 |
| commit | 2fe1e8a7b2f4dcac3fcb07ff06b0ae7396201fd6 (patch) | |
| tree | 22a1a1f79e7289b75ed64cb38ea42234959798bc | |
| parent | a0d5ef457393a240869d837cda1ccb22bbbe3dc2 (diff) | |
| parent | 3f91a89d424a79f8082525db5a375e438887bb3e (diff) | |
| download | linux-2fe1e8a7b2f4dcac3fcb07ff06b0ae7396201fd6.tar.xz | |
Merge tag 'powerpc-4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
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
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 93abf8a9813d..8e1588021d1c 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -347,7 +347,8 @@ early_param("disable_radix", parse_disable_radix); void __init mmu_early_init_devtree(void) { /* Disable radix mode based on kernel command line. */ - if (disable_radix) + /* We don't yet have the machinery to do radix as a guest. */ + if (disable_radix || !(mfmsr() & MSR_HV)) cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; if (early_radix_enabled()) |