xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'signed-for-3.15' of git://github.com/agraf/linux-2.6 into kvm-master

Browse Source 
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.
This commit is contained in:
Paolo Bonzini
2014-05-13 18:15:16 +02:00
parent 696dfd95ba b18db0b808
commit 5367742ad5
7 changed files with 127 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/mm/hash_utils_64.c
View File

@@ -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