diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-03 13:08:50 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-10-03 13:08:50 +0300 |
| commit | d53a4c8e77dae2b71cd9b3fd249ae538f137caeb (patch) | |
| tree | 14fd3036fbef9f86d921a54f193d0bc31b5ba596 /virt/kvm | |
| parent | 24c29b7ac0da3e2eb589553f7a98bade6d0a0e60 (diff) | |
| parent | aac60f1a867773de9eb164013d89c99f3ea1f009 (diff) | |
| download | linux-d53a4c8e77dae2b71cd9b3fd249ae538f137caeb.tar.xz | |
Merge tag 'kvmarm-fixes-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm fixes for 5.4, take #1
- Remove the now obsolete hyp_alternate_select construct
- Fix the TRACE_INCLUDE_PATH macro in the vgic code
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/arm/vgic/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/trace.h b/virt/kvm/arm/vgic/trace.h index 55fed77a9f73..4fd4f6db181b 100644 --- a/virt/kvm/arm/vgic/trace.h +++ b/virt/kvm/arm/vgic/trace.h @@ -30,7 +30,7 @@ TRACE_EVENT(vgic_update_irq_pending, #endif /* _TRACE_VGIC_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH ../../../virt/kvm/arm/vgic +#define TRACE_INCLUDE_PATH ../../virt/kvm/arm/vgic #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace |