Fix: build x86 kvm probes on kernels >= 4.1-rc1

[lttng-modules.git] / probes / Makefile

diff --git a/probes/Makefile b/probes/Makefile
index 4d38199e37c1208ac79b23addd49fce2c54755a1..d4baaeb204ab3cdfb65ebca56555c6e6c3910c1b 100644 (file)
--- 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,15 @@ obj-m +=  $(shell \
                echo "lttng-probe-rcu.o" ; fi;)
 
 ifneq ($(CONFIG_REGMAP),)
+regmap_dep = $(srctree)/drivers/base/regmap/trace.h $(srctree)/include/trace/events/regmap.h
+ifneq ($(wildcard $(regmap_dep)),)
 obj-m +=  $(shell \
        if [ $(VERSION) -ge 4 \
                -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 2 \) ] ; then \
                echo "lttng-probe-regmap.o" ; fi;)
+else
+$(warning Either of files { $(regmap_dep) } not found. Probe "regmap" is disabled. Use full kernel source tree to enable it.)
+endif
 endif
 
 ifneq ($(CONFIG_PM_RUNTIME),)