diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-13 18:15:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-13 18:15:16 +0200 |
| commit | 5367742ad5321dd38058420adb4750ed9c7ead1e (patch) | |
| tree | cdced9ab73b7035afa91019f3490e40b47e4e2db /arch/powerpc/mm | |
| parent | KVM: vmx: disable APIC virtualization in nested guests (diff) | |
| parent | KVM guest: Make pv trampoline code executable (diff) | |
| download | linux-5367742ad5321dd38058420adb4750ed9c7ead1e.tar.xz linux-5367742ad5321dd38058420adb4750ed9c7ead1e.zip | |
Merge tag 'signed-for-3.15' of git://github.com/agraf/linux-2.6 into kvm-master
Patch queue for 3.15 - 2014-05-12
This request includes a few bug fixes that really shouldn't wait for the next
release.
It fixes KVM on 32bit PowerPC when built as module. It also fixes the PV KVM
acceleration when NX gets honored by the host. Furthermore we fix transactional
memory support and numa support on HV KVM.
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index d766d6ee33fe..06ba83b036d3 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -207,6 +207,10 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, if (overlaps_kernel_text(vaddr, vaddr + step)) tprot &= ~HPTE_R_N; + /* Make kvm guest trampolines executable */ + if (overlaps_kvm_tmp(vaddr, vaddr + step)) + tprot &= ~HPTE_R_N; + /* * If relocatable, check if it overlaps interrupt vectors that * are copied down to real 0. For relocatable kernel |