Fix: Always build vmscan probe

[lttng-modules.git] / probes / Kbuild

diff --git a/probes/Kbuild b/probes/Kbuild
index bd35bd75c6c57ea3d5f011ee735eeab7f9f61b01..bf14c751c1a1fcf953f1c5433795d57c1f0d5ac0 100644 (file)
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -5,7 +5,6 @@ include $(TOP_LTTNG_MODULES_DIR)/Makefile.ABI.workarounds
 ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 
 obj-$(CONFIG_LTTNG) += lttng-probe-sched.o
-obj-$(CONFIG_LTTNG) += lttng-probe-i2c.o
 obj-$(CONFIG_LTTNG) += lttng-probe-irq.o
 obj-$(CONFIG_LTTNG) += lttng-probe-timer.o
 obj-$(CONFIG_LTTNG) += lttng-probe-kmem.o
@@ -13,6 +12,11 @@ obj-$(CONFIG_LTTNG) += lttng-probe-module.o
 obj-$(CONFIG_LTTNG) += lttng-probe-power.o
 obj-$(CONFIG_LTTNG) += lttng-probe-statedump.o
 
+i2c_dep = $(srctree)/include/trace/events/i2c.h
+ifneq ($(wildcard $(i2c_dep)),)
+  obj-$(CONFIG_LTTNG) += lttng-probe-i2c.o
+endif
+
 ifneq ($(CONFIG_KVM),)
   obj-$(CONFIG_LTTNG) += lttng-probe-kvm.o
   ifneq ($(CONFIG_X86),)
@@ -139,19 +143,11 @@ ifneq ($(CONFIG_SCSI),)
       echo "lttng-probe-scsi.o" ; fi;)
 endif # CONFIG_SCSI
 
-vmscan = $(shell \
+obj-$(CONFIG_LTTNG) += $(shell \
   if [ $(VERSION) -ge 3 \
     -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 36 \) ] ; then \
     echo "lttng-probe-vmscan.o" ; fi;)
 
-ifneq ($(CONFIG_SWAP),)
-  obj-$(CONFIG_LTTNG) += $(vmscan)
-else
-  ifneq ($(CONFIG_CGROUP_MEM_RES_CTLR),)
-    obj-$(CONFIG_LTTNG) += $(vmscan)
-  endif # CONFIG_CGROUP_MEM_RES_CTLR
-endif # CONFIG_SWAP
-
 # lock probe does not work, so disabling it for now
 #ifneq ($(CONFIG_LOCKDEP),)
 #  obj-$(CONFIG_LTTNG) += lttng-probe-lock.o