Skip to content

Commit fc36a90

Browse files
paulusmackmpe
authored andcommitted
Revert "powerpc/64: Disable use of radix under a hypervisor"
This reverts commit 3f91a89. Now that we do have the machinery for using the radix MMU under a hypervisor, the extra check and comment introduced in 3f91a89 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 <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 6d98ce0 commit fc36a90

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/powerpc/mm/init_64.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,7 @@ static void early_check_vec5(void)
397397
void __init mmu_early_init_devtree(void)
398398
{
399399
/* Disable radix mode based on kernel command line. */
400-
/* We don't yet have the machinery to do radix as a guest. */
401-
if (disable_radix || !(mfmsr() & MSR_HV))
400+
if (disable_radix)
402401
cur_cpu_spec->mmu_features &= ~MMU_FTR_TYPE_RADIX;
403402

404403
/*

0 commit comments

Comments
 (0)