From 1d443b34028ae43e9c9ee48fd19ece3edb9ae074 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 23 Jun 2011 22:36:45 -0400 Subject: [PATCH] Allow building on kernels < 2.6.33 (without perf event support) Signed-off-by: Mathieu Desnoyers --- Makefile | 4 +++- ltt-events.h | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) 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, -- 2.34.1