diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:07:12 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 16:07:12 -0400 |
| commit | 06502bfa7112d22e1523a818c53f7131b330e269 (patch) | |
| tree | c4d33412aaad28b1a254cfd3b0289554179e0750 | |
| parent | 2c654ef8a3f9808af2cd70734a5b7819382817a9 (diff) | |
| download | longterm-queue-4.12-06502bfa7112d22e1523a818c53f7131b330e269.tar.gz | |
kvm: arm - fix up for file rename
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-arm-arm64-Do-not-use-kern_hyp_va-with-kvm_vgic_g.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/queue/KVM-arm-arm64-Do-not-use-kern_hyp_va-with-kvm_vgic_g.patch b/queue/KVM-arm-arm64-Do-not-use-kern_hyp_va-with-kvm_vgic_g.patch index 87cda9c..f786b19 100644 --- a/queue/KVM-arm-arm64-Do-not-use-kern_hyp_va-with-kvm_vgic_g.patch +++ b/queue/KVM-arm-arm64-Do-not-use-kern_hyp_va-with-kvm_vgic_g.patch @@ -1,4 +1,4 @@ -From 44a497abd621a71c645f06d3d545ae2f46448830 Mon Sep 17 00:00:00 2001 +From a04f39369288d201e14facb9238afc1df6898cb9 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Sun, 3 Dec 2017 19:28:56 +0000 Subject: [PATCH] KVM: arm/arm64: Do not use kern_hyp_va() with @@ -19,9 +19,10 @@ So let's bite the bullet and provide our own accessor. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Reviewed-by: James Morse <james.morse@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h -index de1b919404e4..93395b7c2322 100644 +index eb46fc81a440..26d3b8ed2166 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -28,6 +28,13 @@ @@ -39,10 +40,10 @@ index de1b919404e4..93395b7c2322 100644 * KVM_MMU_CACHE_MIN_PAGES is the number of stage2 page table translation levels. */ diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h -index 0656c79d968f..021d3a8117a8 100644 +index 8d619eadbcc5..034240bde5b7 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h -@@ -110,6 +110,26 @@ static inline unsigned long __kern_hyp_va(unsigned long v) +@@ -130,6 +130,26 @@ static inline unsigned long __kern_hyp_va(unsigned long v) #define kern_hyp_va(v) ((typeof(v))(__kern_hyp_va((unsigned long)(v)))) @@ -69,11 +70,11 @@ index 0656c79d968f..021d3a8117a8 100644 /* * We currently only support a 40bit IPA. */ -diff --git a/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c b/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c -index 97f357ea9c72..10eb2e96b3e6 100644 ---- a/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c -+++ b/arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c -@@ -60,7 +60,7 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) +diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c +index d7fd46fe9efb..4b4221b0d4ba 100644 +--- a/virt/kvm/arm/hyp/vgic-v2-sr.c ++++ b/virt/kvm/arm/hyp/vgic-v2-sr.c +@@ -139,7 +139,7 @@ int __hyp_text __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu) return -1; rd = kvm_vcpu_dabt_get_rd(vcpu); |