From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 20 Apr 2017 19:23:25 +0000 (-0400)
Subject: Fix: Always build vmscan probe
X-Git-Tag: v2.8.5~15
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9c8dbd0a053a26906d64ae4ef15fd21279f8cdb9;p=lttng-modules.git

Fix: Always build vmscan probe

The mm/vmscan.c compile unit is a obj-y, even on an old 2.6.36 kernel,
always build the vmscan probe regardless of kernel configuration.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/probes/Kbuild b/probes/Kbuild
index 8ae9a6bb..2fc16eb0 100644
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -138,19 +138,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) -ge 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