From: Julien Desfossez <jdesfossez@efficios.com>
Date: Tue, 30 Sep 2014 20:49:32 +0000 (-0400)
Subject: Fix: redefinition of DEFINE_WRITEBACK_EVENT
X-Git-Tag: v2.6.0-rc1~17
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=59fecd6c4447460c6834d1da42c76c7016e5fbc3

Fix: redefinition of DEFINE_WRITEBACK_EVENT

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/instrumentation/events/lttng-module/writeback.h b/instrumentation/events/lttng-module/writeback.h
index 2dca4e41..5525fed4 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), \