From c782f1f3e8c799b7ba531ba940209014b66d4564 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 27 Apr 2016 15:18:42 -0400 Subject: [PATCH] Fix: missing Tracepoint prototype checking due to bogus merge Backport of the following commit: commit 6633b022a8e6ef247af926919b493284308f7883 Author: Mathieu Desnoyers 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 --- probes/lttng-events.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/probes/lttng-events.h b/probes/lttng-events.h index 0796b71a..f6f7ef1c 100644 --- 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 -- 2.34.1