From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 26 Sep 2014 19:40:12 +0000 (-0400)
Subject: Fix instrumentation of vmscan for older kernels
X-Git-Tag: v2.6.0-rc1~20
X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=fcf7fa335dc9b5119fccc23bb81fff546ce854ec

Fix instrumentation of vmscan for older kernels

Missing definition of LTTNG_TRACEPOINT_EVENT_CONDITION_MAP and
LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP, only used for rather old
kernels (e.g. 3.2.62).

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

diff --git a/probes/define_trace.h b/probes/define_trace.h
index 606b529d..28125edd 100644
--- a/probes/define_trace.h
+++ b/probes/define_trace.h
@@ -69,8 +69,7 @@
 #define LTTNG_TRACEPOINT_EVENT_INSTANCE_PRINT_MAP(template, name, map, proto, args, print)
 
 #undef LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP
-#define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(template, name, map, proto, args, cond) \
-	LTTNG_TRACEPOINT_EVENT_INSTANCE(template, name, PARAMS(proto), PARAMS(args))
+#define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(template, name, map, proto, args, cond)
 
 #undef LTTNG_TRACEPOINT_EVENT
 #define LTTNG_TRACEPOINT_EVENT(name, proto, args, tstruct, assign, print)
diff --git a/probes/lttng-events.h b/probes/lttng-events.h
index 616850f4..22cabbaa 100644
--- a/probes/lttng-events.h
+++ b/probes/lttng-events.h
@@ -87,6 +87,10 @@
 		PARAMS(assign),						\
 		PARAMS(print))
 
+#undef LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP
+#define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(template, name, map, proto, args, cond) \
+	LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(template, name, map, PARAMS(proto), PARAMS(args))
+
 /*
  * LTTNG_TRACEPOINT_EVENT_CLASS can be used to add a generic function
  * handlers for events. That is, if all events have the same parameters
diff --git a/probes/lttng-tracepoint-event.h b/probes/lttng-tracepoint-event.h
index c2ecb624..c7b70ac8 100644
--- a/probes/lttng-tracepoint-event.h
+++ b/probes/lttng-tracepoint-event.h
@@ -47,6 +47,8 @@
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
 #define LTTNG_TRACEPOINT_EVENT_CONDITION(name, proto, args, cond, struct, assign, print) \
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
+#define LTTNG_TRACEPOINT_EVENT_CONDITION_MAP(name, map, proto, args, cond, struct, assign, print) \
+	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
 #define LTTNG_TRACEPOINT_EVENT_MAP_NOARGS(name, map, struct, assign, print) \
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE_NOARGS(name))
 
@@ -64,6 +66,8 @@
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
 #define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION(template, name, proto, args, cond) \
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
+#define LTTNG_TRACEPOINT_EVENT_INSTANCE_CONDITION_MAP(template, name, map, proto, args, cond) \
+	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
 #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(_template, _name, _map, _proto, _args) \
 	_LTTNG_INSTRUMENTATION(DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)))
 #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \