Commit fc36a903 authored Mar 21, 2017 by Paul Mackerras Committed by Michael Ellerman Mar 21, 2017

Revert "powerpc/64: Disable use of radix under a hypervisor"



This reverts commit 3f91a89d.

Now that we do have the machinery for using the radix MMU under a
hypervisor, the extra check and comment introduced in 3f91a89d 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>

parent 6d98ce0b

arch/powerpc/mm/init_64.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;

		/*