Merged into master, 2.10, 2.9, thanks! Mathieu
----- On Feb 20, 2018, at 12:10 PM, Michael Jeanson [email protected] wrote: > Starting from 4.14.13-300 the fedora kernel backport a kvm instrumentation > change introduced in 4.15 which affects the prototype of the kvm_mmio event. > > Signed-off-by: Michael Jeanson <[email protected]> > --- > instrumentation/events/lttng-module/kvm.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/instrumentation/events/lttng-module/kvm.h > b/instrumentation/events/lttng-module/kvm.h > index 9bbf95f..76eaa69 100644 > --- a/instrumentation/events/lttng-module/kvm.h > +++ b/instrumentation/events/lttng-module/kvm.h > @@ -91,7 +91,8 @@ LTTNG_TRACEPOINT_EVENT(kvm_ack_irq, > || LTTNG_KERNEL_RANGE(4,4,112, 4,5,0) \ > || LTTNG_KERNEL_RANGE(3,16,52, 3,17,0) \ > || LTTNG_KERNEL_RANGE(3,2,97, 3,3,0) \ > - || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0)) > + || LTTNG_DEBIAN_KERNEL_RANGE(4,9,65,0,3,0, 4,10,0,0,0,0) \ > + || LTTNG_FEDORA_KERNEL_RANGE(4,14,13,300, 4,15,0,0)) > > LTTNG_TRACEPOINT_EVENT(kvm_mmio, > TP_PROTO(int type, int len, u64 gpa, void *val), > -- > 2.7.4 -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
