X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=probes%2FMakefile;h=8e4ceb7b3e4903b87542b33ab6546c40dbe3c019;hb=1b2a5429de815c95643df2eadf91253909708728;hp=13bf2084451acf9ba3ed4c1738fd786e54e9082c;hpb=b3c40230ad700b12c39640d8593aece428a2702b;p=lttng-modules.git

diff --git a/probes/Makefile b/probes/Makefile
index 13bf2084..8e4ceb7b 100644
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -18,22 +18,18 @@ obj-m += lttng-probe-power.o
 obj-m += lttng-probe-statedump.o
 
 ifneq ($(CONFIG_KVM),)
-kvm = lttng-probe-kvm.o
+obj-m += lttng-probe-kvm.o
 ifneq ($(CONFIG_X86),)
 kvm_dep = $(srctree)/virt/kvm/iodev.h
-kvm_x86 = lttng-probe-kvm-x86.o
-kvm_x86_mmu = lttng-probe-kvm-x86-mmu.o
-kvm_path = $(srctree)/virt/kvm
-ifeq ($(wildcard $(kvm_dep)),)
-$(warning Files $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
-kvm_x86 =
-kvm_path =
+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
+else
+$(warning File $(kvm_dep) not found. Probe "kvm" x86-specific is disabled. Use full kernel source tree to enable it.)
 endif
-obj-m += $(kvm_x86)
-obj-m += $(kvm_x86_mmu)
-ccflags-y += -I$(kvm_path)
 endif
-obj-m += $(kvm)
 endif
 
 obj-m +=  $(shell \
@@ -201,6 +197,12 @@ obj-m +=  $(shell \
 		echo "lttng-probe-sunrpc.o" ; fi;)
 endif
 
+ifneq ($(CONFIG_VIDEO_V4L2),)
+obj-m += $(shell \
+	if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 14 ] ; then \
+		echo "lttng-probe-v4l2.o" ; fi;)
+endif
+
 obj-m += lttng-probe-workqueue.o
 
 ifneq ($(CONFIG_KALLSYMS_ALL),)
@@ -208,6 +210,8 @@ obj-m +=  $(shell \
 	if [ $(VERSION) -ge 3 \
 		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 36 \) ] ; then \
 		echo "lttng-probe-writeback.o" ; fi;)
+else
+$(warning CONFIG_KALLSYMS_ALL is disabled, therefore probe "writeback" is disabled. Rebuild your kernel with this configuration option enabled in order to trace this subsystem.)
 endif