X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=probes%2FMakefile;h=cc4c352168dcef0f97f57a0a6963d65401770a5a;hb=c782f1f3e8c799b7ba531ba940209014b66d4564;hp=f0325c875e2cb3f233fdd1c3181794c0e20dc5dd;hpb=4f8da7f34120a5cfe9f7ab9f6f739faacb52dced;p=lttng-modules.git

diff --git a/probes/Makefile b/probes/Makefile
index f0325c87..cc4c3521 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -5,9 +5,10 @@
 ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
-KERNELDIR=${LTTNG_KERNELDIR}
+KERNELDIR = ${LTTNG_KERNELDIR}
+MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
-include $(KBUILD_EXTMOD)/Makefile.ABI.workarounds
+include $(MAKEFILEDIR)/../Makefile.ABI.workarounds
 
 ccflags-y += -I$(PWD)/probes
 obj-m += lttng-types.o
@@ -24,6 +25,8 @@ obj-m += lttng-probe-statedump.o
 ifneq ($(CONFIG_KVM),)
 obj-m += lttng-probe-kvm.o
 ifneq ($(CONFIG_X86),)
+kvm_dep_lapic = $(srctree)/arch/x86/kvm/lapic.h
+ifneq ($(wildcard $(kvm_dep_lapic)),)
 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
@@ -39,6 +42,9 @@ obj-m +=  $(shell \
 else
 $(warning File $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
 endif
+else
+$(warning File $(kvm_dep_lapic) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
+endif
 endif
 endif