summaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2018-12-19 09:28:38 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2018-12-19 18:47:53 +0100
commit58466766cd35754a061414c0c93225db2962948e (patch)
treec39cdb2d9932603bfe0f704f9a1db7c6536dc103 /virt/kvm
parentarm64: KVM: Avoid setting the upper 32 bits of VTCR_EL2 to 1 (diff)
downloadlinux-58466766cd35754a061414c0c93225db2962948e.tar.xz
linux-58466766cd35754a061414c0c93225db2962948e.zip
arm/arm64: KVM: Add ARM_EXCEPTION_IS_TRAP macro
32 and 64bit use different symbols to identify the traps. 32bit has a fine grained approach (prefetch abort, data abort and HVC), while 64bit is pretty happy with just "trap". This has been fine so far, except that we now need to decode some of that in tracepoints that are common to both architectures. Introduce ARM_EXCEPTION_IS_TRAP which abstracts the trap symbols and make the tracepoint use it. Acked-by: Christoffer Dall <christoffer.dall@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/arm/trace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/trace.h b/virt/kvm/arm/trace.h
index f21f04f8036d..3828beab93f2 100644
--- a/virt/kvm/arm/trace.h
+++ b/virt/kvm/arm/trace.h
@@ -37,7 +37,7 @@ TRACE_EVENT(kvm_exit,
TP_fast_assign(
__entry->ret = ARM_EXCEPTION_CODE(ret);
- __entry->esr_ec = (ARM_EXCEPTION_CODE(ret) == ARM_EXCEPTION_TRAP) ? esr_ec : 0;
+ __entry->esr_ec = ARM_EXCEPTION_IS_TRAP(ret) ? esr_ec : 0;
__entry->vcpu_pc = vcpu_pc;
),