diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-07-30 16:13:04 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-30 16:13:04 +0100 |
| commit | 16314874b12b451bd5a1df86bcb69745eb487502 (patch) | |
| tree | ef70b8e564989ee2418834e6fb6c2fd553b43143 /include | |
| parent | 236a559919c44999ae64826fb1743e18ab4bc25c (diff) | |
| parent | 022c8328dc8021248047b373b9f67790641b8f2d (diff) | |
| download | linux-stable-16314874b12b451bd5a1df86bcb69745eb487502.tar.gz linux-stable-16314874b12b451bd5a1df86bcb69745eb487502.tar.bz2 linux-stable-16314874b12b451bd5a1df86bcb69745eb487502.zip | |
Merge branch 'kvm-arm64/misc-5.9' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/kvm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h index 2c735a3e6613..9417a34aad08 100644 --- a/include/trace/events/kvm.h +++ b/include/trace/events/kvm.h @@ -17,7 +17,7 @@ ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI), ERSN(PAPR_HCALL), \ ERSN(S390_UCONTROL), ERSN(WATCHDOG), ERSN(S390_TSCH), ERSN(EPR),\ ERSN(SYSTEM_EVENT), ERSN(S390_STSI), ERSN(IOAPIC_EOI), \ - ERSN(HYPERV) + ERSN(HYPERV), ERSN(ARM_NISV) TRACE_EVENT(kvm_userspace_exit, TP_PROTO(__u32 reason, int errno), |