Fix: missing Tracepoint prototype checking due to bogus merge

Backport of the following commit:

commit 6633b022a8e6ef247af926919b493284308f7883
Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date:   Fri Apr 17 16:35:35 2015 -0400

    Fix: check that class and instance prototype match

accidently disabled Tracepoint prototype checking by removing
the #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) required
to perform prototype checking between kernel and lttng-modules.
This issue was introduced in 2.6.1, only in the stable-2.6 branch.

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

diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 0796b71afe1572672ed569afc5cc0cfb301be6cf..f6f7ef1c3bebb1a6b953d7f44f94164d9018b53b 100644 (file)
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -183,7 +183,9 @@ void trace_##_name(_proto);
 #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \
 void trace_##_name(void);
 
- /*
+#include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
+
+/*
  * Stage 1.1 of the trace events.
  *
  * Create dummy trace prototypes for each event class, and for each used