Fix: Always build vmscan probe
A message that is not in the archive (sent off-list or not yet received): [email protected]
Let's merge it into master for now, and see if the CI complains. If it all pass fine, I'll cherry-pick this into stable versions as well.
Thanks,
Mathieu
Quoted 36 lines · ----- On Apr 20, 2017, at 3:23 PM, Michael Jeanson [email protected] wrote:
The
mm/vmscan.ccompile 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 <[email protected]>---
probes/Kbuild | 10 +---------1 file changed, 1 insertion(+), 9 deletions(-)probes/Kbuild +0
-0@@ -143,19 +143,11 @@ ifneq ($(CONFIG_SCSI),) echo "lttng-probe-scsi.o" ; fi;)endif #
CONFIG_SCSIprobes/Kbuild +1
-9-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 -- 2.7.4
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
Appliedmerged into 2.8 and 2.9 too.
Thanks,
Mathieu
Quoted 50 lines · ----- On Apr 20, 2017, at 3:39 PM, Mathieu Desnoyers…
Let's merge it into master for now, and see if the CI complains. If it all pass fine, I'll cherry-pick this into stable versions as well.
Thanks,
Mathieu
Quoted 31 lines · ----- On Apr 20, 2017, at 3:23 PM, Michael Jeanson [email protected] wrote:
The
mm/vmscan.ccompile 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 <[email protected]>---
probes/Kbuild | 10 +---------1 file changed, 1 insertion(+), 9 deletions(-)probes/Kbuild +0
-0@@ -143,19 +143,11 @@ ifneq ($(CONFIG_SCSI),) echo "lttng-probe-scsi.o" ; fi;)endif #
CONFIG_SCSIprobes/Kbuild +1
-9-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 -Quoted 5 lines
# lock probe does not work, so disabling it for now #ifneq ($(CONFIG_LOCKDEP),) # obj-$(CONFIG_LTTNG) += lttng-probe-lock.o -- 2.7.4--
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
Signature · 7 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev