diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-03-21 12:38:02 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-03-21 16:50:28 +1100 |
| commit | fc36a903265c18d124cefaba364a7fa71b21be61 (patch) | |
| tree | a6ffd41e430bdf0abb3d154e5d5d667617685cc9 /arch | |
| parent | 6d98ce0be541d4a3cfbb52cd75072c0339ebb500 (diff) | |
| download | linux-fc36a903265c18d124cefaba364a7fa71b21be61.tar.bz2 | |
Revert "powerpc/64: Disable use of radix under a hypervisor"
This reverts commit 3f91a89d424a79f8082525db5a375e438887bb3e.
Now that we do have the machinery for using the radix MMU under a
hypervisor, the extra check and comment introduced in 3f91a89d424a are
no longer correct. The result is that when booted under a hypervisor
that only allows use of radix, we clear the MMU_FTR_TYPE_RADIX and
then set it again, and print a warning about ignoring the
disable_radix command line option, even though the command line does
not include "disable_radix".
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/mm/init_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c index 9be992083d2a..c22f207aa656 100644 --- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -397,8 +397,7 @@ static void early_check_vec5(void) void __init mmu_early_init_devtree(void) { /* Disable radix mode based on kernel command line. */ - /* We don't yet have the machinery to do radix as a guest. */ - if (disable_radix || !(mfmsr() & MSR_HV)) + if (disable_radix) cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX; /* |