diff options
| author | Paul Mackerras <paulus@ozlabs.org> | 2017-08-31 12:37:03 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@ozlabs.org> | 2017-08-31 12:37:03 +1000 |
| commit | 4dafecde443a3f5690d68a3a0d32202b634b2675 (patch) | |
| tree | 6faa5efe3fa7f9a24514111777515e7a4c8bd8c1 /arch/powerpc/kvm/book3s_64_mmu_hv.c | |
| parent | e3bfed1df379c18f20feb06427d952b766e2c00f (diff) | |
| parent | 94a04bc25a2c6296bd0c5e82c10e8231c2b11f77 (diff) | |
| download | linux-stable-4dafecde443a3f5690d68a3a0d32202b634b2675.tar.gz linux-stable-4dafecde443a3f5690d68a3a0d32202b634b2675.tar.bz2 linux-stable-4dafecde443a3f5690d68a3a0d32202b634b2675.zip | |
Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next
This merges in the 'ppc-kvm' topic branch from the powerpc tree in
order to bring in some fixes which touch both powerpc and KVM code.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Diffstat (limited to 'arch/powerpc/kvm/book3s_64_mmu_hv.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_64_mmu_hv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c index b42812e014c0..67075e065ef2 100644 --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -37,6 +37,7 @@ #include <asm/synch.h> #include <asm/ppc-opcode.h> #include <asm/cputable.h> +#include <asm/pte-walk.h> #include "trace_hv.h" @@ -599,8 +600,8 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, * hugepage split and collapse. */ local_irq_save(flags); - ptep = find_linux_pte_or_hugepte(current->mm->pgd, - hva, NULL, NULL); + ptep = find_current_mm_pte(current->mm->pgd, + hva, NULL, NULL); if (ptep) { pte = kvmppc_read_update_linux_pte(ptep, 1); if (__pte_write(pte)) |