X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=probes%2FMakefile;h=4de157b3dcdffb3b734dbd4df413639e8f9f696e;hb=fa73b7a2bdfee670825a82a4cbe0cedfd36807bf;hp=4d38199e37c1208ac79b23addd49fce2c54755a1;hpb=58ee8fea5ffd5c65a77a94ce1c434bd6e8eb2efa;p=lttng-modules.git

diff --git a/probes/Makefile b/probes/Makefile
index 4d38199e..4de157b3 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -24,7 +24,7 @@ obj-m += lttng-probe-statedump.o
 ifneq ($(CONFIG_KVM),)
 obj-m += lttng-probe-kvm.o
 ifneq ($(CONFIG_X86),)
-kvm_dep = $(srctree)/virt/kvm/iodev.h
+kvm_dep = $(srctree)/virt/kvm/iodev.h $(srctree)/include/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
@@ -192,10 +192,12 @@ obj-m +=  $(shell \
 		echo "lttng-probe-rcu.o" ; fi;)
 
 ifneq ($(CONFIG_REGMAP),)
-obj-m +=  $(shell \
-	if [ $(VERSION) -ge 4 \
-		-o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
-		echo "lttng-probe-regmap.o" ; fi;)
+regmap_dep_4_1 = $(srctree)/drivers/base/regmap/trace.h
+ifneq ($(wildcard $(regmap_dep_4_1)),)
+obj-m += lttng-probe-regmap.o
+else
+$(warning File $(regmap_dep_4_1) not found. Probe "regmap" is disabled. Need Linux 4.1+ kernel source tree to enable it.)
+endif
 endif
 
 ifneq ($(CONFIG_PM_RUNTIME),)