diff options
| author | James Hogan <james.hogan@imgtec.com> | 2017-03-14 10:15:29 +0000 |
|---|---|---|
| committer | James Hogan <james.hogan@imgtec.com> | 2017-03-28 14:53:53 +0100 |
| commit | 60c7aa3320dffba4929ef3f46a2daeb5feea6d07 (patch) | |
| tree | d01bf00499e854917bbd10e72f804f9bd4ce5f6e | |
| parent | 5dee99b24eeffbe673a71237faf551978cd311d3 (diff) | |
| download | linux-60c7aa3320dffba4929ef3f46a2daeb5feea6d07.tar.gz linux-60c7aa3320dffba4929ef3f46a2daeb5feea6d07.tar.bz2 linux-60c7aa3320dffba4929ef3f46a2daeb5feea6d07.zip | |
KVM: MIPS/Emulate: Drop CACHE emulation for VZ
Ifdef out the trap & emulate CACHE instruction emulation functions for
VZ. We will provide separate CACHE instruction emulation in vz.c, and we
need to avoid linker errors due to the use of T&E specific MMU helpers.
Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: "Radim Krčmář" <rkrcmar@redhat.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
| -rw-r--r-- | arch/mips/kvm/emulate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c index 42424822898c..bb0449296cd6 100644 --- a/arch/mips/kvm/emulate.c +++ b/arch/mips/kvm/emulate.c @@ -1665,6 +1665,7 @@ enum emulation_result kvm_mips_emulate_load(union mips_instruction inst, return EMULATE_DO_MMIO; } +#ifndef CONFIG_KVM_MIPS_VZ static enum emulation_result kvm_mips_guest_cache_op(int (*fn)(unsigned long), unsigned long curr_pc, unsigned long addr, @@ -1872,6 +1873,7 @@ unknown: return er; } +#endif /* CONFIG_KVM_MIPS_VZ */ /** * kvm_mips_guest_exception_base() - Find guest exception vector base address. |