Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fe1e8a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a0d5ef45 3f91a89d

arch/powerpc/mm/init_64.c

+2 −1
Original line number Diff line number Diff line
@@ -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())