From d11cd9013dcf4aef0e174ea66032c0b0cf517c22 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 23 Apr 2015 17:46:51 -0400 Subject: [PATCH] Fix: disable x86 kvm instrumentation for kernels < 2.6.38 Signed-off-by: Mathieu Desnoyers --- probes/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/probes/Makefile b/probes/Makefile index 8e4ceb7b..1f3c6ad2 100644 --- a/probes/Makefile +++ b/probes/Makefile @@ -24,8 +24,14 @@ kvm_dep = $(srctree)/virt/kvm/iodev.h ifneq ($(wildcard $(kvm_dep)),) CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm -obj-m += lttng-probe-kvm-x86.o -obj-m += lttng-probe-kvm-x86-mmu.o +obj-m += $(shell \ + if [ $(VERSION) -ge 3 \ + -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ + echo "lttng-probe-kvm-x86.o" ; fi;) +obj-m += $(shell \ + if [ $(VERSION) -ge 3 \ + -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \ + echo "lttng-probe-kvm-x86-mmu.o" ; fi;) else $(warning File $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.) endif -- 2.34.1