From: Samuel Martin <smartin@aldebaran-robotics.com>
Date: Mon, 17 Jun 2013 14:28:51 +0000 (-0400)
Subject: Fix build and load against linux-2.6.33.x
X-Git-Tag: v2.2.0-rc3~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4a1215a7771a365c2f018bb279031ee3fc2f8900;p=lttng-modules.git

Fix build and load against linux-2.6.33.x

* lttng-event.h declared but did not implement
  lttng_add_perf_counter_to_ctx on kernel >=2.6.33, the implementation
  was in lttng-context-perf-counters.c, which was only included for
  kernel >=2.6.34.  This prevented the module from being loaded.

* on kernel 2.6.33.x, lttng-context-perf-counters.c complains about
  implicit declaration for {get,put}_online_cpus and
  {,un}register_cpu_notifier; so fix header inclusion.

Signed-off-by: Samuel Martin <smartin@aldebaran-robotics.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/Makefile b/Makefile
index 39672afc..a9d1cb15 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
 ifneq ($(CONFIG_PERF_EVENTS),)
 lttng-tracer-objs += $(shell \
 	if [ $(VERSION) -ge 3 \
-		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 34 \) ] ; then \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
 		echo "lttng-context-perf-counters.o" ; fi;)
 endif # CONFIG_PERF_EVENTS
 
diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
index e0714ebf..8dc95ff3 100644
--- a/lttng-context-perf-counters.c
+++ b/lttng-context-perf-counters.c
@@ -25,6 +25,7 @@
 #include <linux/perf_event.h>
 #include <linux/list.h>
 #include <linux/string.h>
+#include <linux/cpu.h>
 #include "lttng-events.h"
 #include "wrapper/ringbuffer/frontend_types.h"
 #include "wrapper/vmalloc.h"