From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 27 Apr 2016 19:18:42 +0000 (-0400)
Subject: Fix: missing Tracepoint prototype checking due to bogus merge
X-Git-Tag: v2.6.6~14
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=c782f1f3e8c799b7ba531ba940209014b66d4564;hp=c782f1f3e8c799b7ba531ba940209014b66d4564;p=lttng-modules.git

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>
---