[lttng-dev] [PATCH lttng-modules] Fix: Always build vmscan probe

[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

----- On Apr 20, 2017, at 3:23 PM, Michael Jeanson mjeanson at efficios.com wrote:

> 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 at efficios.com>
> ---
> probes/Kbuild | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/probes/Kbuild b/probes/Kbuild
> index 2afb6dd..bf14c75 100644
> --- a/probes/Kbuild
> +++ b/probes/Kbuild
> @@ -143,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
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com