diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
| commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
| tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /arch/powerpc | |
| parent | 4e33e34625103593a71d2bae471ce49cef62ef06 (diff) | |
| parent | 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 (diff) | |
| download | linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/powerpc')
| -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()) |