diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 12:53:19 +0400 |
| commit | 256e5d8c3f7bae348b2115e0323ef9e836eb4d47 (patch) | |
| tree | 354d0743226588e414e0d2a917418b3eb904695f /arch/arm/include/asm/kvm_asm.h | |
| parent | b068b1e7d514d8806623ece2fc76aacf523f487d (diff) | |
| parent | 2be12549c900303c418fcbb7044979e190fd4e7e (diff) | |
Merge remote-tracking branch 'nico/iks' into lsk-3.9-vexpress-iks
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'arch/arm/include/asm/kvm_asm.h')
| -rw-r--r-- | arch/arm/include/asm/kvm_asm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_asm.h b/arch/arm/include/asm/kvm_asm.h index e4956f4e23e..18d50322a9e 100644 --- a/arch/arm/include/asm/kvm_asm.h +++ b/arch/arm/include/asm/kvm_asm.h @@ -75,7 +75,7 @@ extern char __kvm_hyp_code_end[]; extern void __kvm_tlb_flush_vmid(struct kvm *kvm); extern void __kvm_flush_vm_context(void); -extern void __kvm_tlb_flush_vmid(struct kvm *kvm); +extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa); extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu); #endif |