[lttng-dev] [PATCH lttng-modules] lttng-modules: fix build and load against linux-2.6.33.x

[Mathieu Desnoyers]

* Samuel Martin (smartin at aldebaran-robotics.com) wrote:
> * 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.

merged into master, stable-2.2, stable-2.1, stable-2.0 branches, thanks!

Mathieu

> 
> Signed-off-by: Samuel Martin <smartin at aldebaran-robotics.com>
> ---
>  Makefile                      | 2 +-
>  lttng-context-perf-counters.c | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 2da7298..66d94bc 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -33,7 +33,7 @@ endif
>  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
>  
> diff --git a/lttng-context-perf-counters.c b/lttng-context-perf-counters.c
> index b97b40b..8c4a48a 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"
> -- 
> 1.8.3.1
> 
> 
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com