From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 24 Jun 2011 02:36:45 +0000 (-0400)
Subject: Allow building on kernels < 2.6.33 (without perf event support)
X-Git-Tag: v2.0-pre1~39
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1d443b34028ae43e9c9ee48fd19ece3edb9ae074;p=lttng-modules.git

Allow building on kernels < 2.6.33 (without perf event support)

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

diff --git a/Makefile b/Makefile
index 517d1f75..9a0effcf 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,9 @@ ltt-relay-objs :=  ltt-events.o ltt-debugfs-abi.o \
 			lttng-context-vppid.o
 
 ifneq ($(CONFIG_PERF_EVENTS),)
-ltt-relay-objs += lttng-context-perf-counters.o
+ltt-relay-objs += $(shell \
+	if [ $(VERSION) -ge 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 ] ; then \
+		echo "lttng-context-perf-counters.o" ; fi;)
 endif
 
 obj-m += probes/
diff --git a/ltt-events.h b/ltt-events.h
index 4d4eea93..10015ad6 100644
--- a/ltt-events.h
+++ b/ltt-events.h
@@ -296,10 +296,21 @@ int lttng_add_tid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_vtid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_ppid_to_ctx(struct lttng_ctx **ctx);
 int lttng_add_vppid_to_ctx(struct lttng_ctx **ctx);
+#ifdef CONFIG_PERF_EVENTS
 int lttng_add_perf_counter_to_ctx(uint32_t type,
 				  uint64_t config,
 				  const char *name,
 				  struct lttng_ctx **ctx);
+#else
+static inline
+int lttng_add_perf_counter_to_ctx(uint32_t type,
+				  uint64_t config,
+				  const char *name,
+				  struct lttng_ctx **ctx)
+{
+	return -ENOSYS;
+}
+#endif
 
 #ifdef CONFIG_KPROBES
 int lttng_kprobes_register(const char *name,