Merged, thanks! Mathieu
----- Original Message ----- > From: "Julien Desfossez" <[email protected]> > To: "mathieu desnoyers" <[email protected]> > Cc: [email protected], "Julien Desfossez" <[email protected]> > Sent: Tuesday, September 30, 2014 4:49:32 PM > Subject: [MODULES PATCH 1/2] Fix: redefinition of DEFINE_WRITEBACK_EVENT > > Signed-off-by: Julien Desfossez <[email protected]> > --- > instrumentation/events/lttng-module/writeback.h | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/instrumentation/events/lttng-module/writeback.h > b/instrumentation/events/lttng-module/writeback.h > index 2dca4e4..5525fed 100644 > --- a/instrumentation/events/lttng-module/writeback.h > +++ b/instrumentation/events/lttng-module/writeback.h > @@ -99,6 +99,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(writeback_class, > __entry->name > ) > ) > +#undef DEFINE_WRITEBACK_EVENT > #define DEFINE_WRITEBACK_EVENT(name) \ > LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_class, name, \ > TP_PROTO(struct backing_dev_info *bdi), \ > -- > 1.9.1 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
