X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=probes%2FKbuild;h=b43dd497b5a5341ac6d614f5ae1f8c340884d553;hb=12ce29c71d1da850b5a44d92ad9756dfa3f6292e;hp=1c6b9d0f42d59682e8835999e816ae298677990e;hpb=c52610a481844423e94367b3a1a4e343269c2038;p=lttng-modules.git

diff --git a/probes/Kbuild b/probes/Kbuild
index 1c6b9d0f..b43dd497 100644
--- a/probes/Kbuild
+++ b/probes/Kbuild
@@ -1,8 +1,10 @@
-MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
+# SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1)
 
-include $(MAKEFILEDIR)/../Makefile.ABI.workarounds
+TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
-ccflags-y += -I$(PWD) -I$(PWD)/..
+include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
+
+ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 
 obj-$(CONFIG_LTTNG) += lttng-probe-sched.o
 obj-$(CONFIG_LTTNG) += lttng-probe-irq.o
@@ -12,6 +14,18 @@ obj-$(CONFIG_LTTNG) += lttng-probe-module.o
 obj-$(CONFIG_LTTNG) += lttng-probe-power.o
 obj-$(CONFIG_LTTNG) += lttng-probe-statedump.o
 
+ifneq ($(CONFIG_NET_9P),)
+  obj-$(CONFIG_LTTNG) +=  $(shell \
+    if [ $(VERSION) -ge 4 \
+      -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -eq 10 \) ] ; then \
+      echo "lttng-probe-9p.o" ; fi;)
+endif # CONFIG_NET_9P
+
+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),)
@@ -21,14 +35,8 @@ ifneq ($(CONFIG_KVM),)
       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-$(CONFIG_LTTNG) +=  $(shell \
-          if [ $(VERSION) -ge 3 \
-            -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \
-            echo "lttng-probe-kvm-x86.o" ; fi;)
-        obj-$(CONFIG_LTTNG) +=  $(shell \
-          if [ $(VERSION) -ge 3 \
-            -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \
-            echo "lttng-probe-kvm-x86-mmu.o" ; fi;)
+        obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
+        obj-$(CONFIG_LTTNG) += 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 # $(wildcard $(kvm_dep))
@@ -52,10 +60,7 @@ ifneq ($(CONFIG_X86),)
   endif # $(wildcard $(x86_exceptions_dep))
 endif # CONFIG_X86
 
-obj-$(CONFIG_LTTNG) +=  $(shell \
-  if [ $(VERSION) -ge 3 \
-    -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
-    echo "lttng-probe-signal.o" ; fi;)
+obj-$(CONFIG_LTTNG) += lttng-probe-signal.o
 
 ifneq ($(CONFIG_BLOCK),)
   # need blk_cmd_buf_len
@@ -67,10 +72,7 @@ endif # CONFIG_BLOCK
 ifneq ($(CONFIG_NET),)
   obj-$(CONFIG_LTTNG) += lttng-probe-napi.o
   obj-$(CONFIG_LTTNG) += lttng-probe-skb.o
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 37 \) ] ; then \
-      echo "lttng-probe-net.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-net.o
   obj-$(CONFIG_LTTNG) +=  $(shell \
     if [ $(VERSION) -ge 4 \
       -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
@@ -82,23 +84,22 @@ ifneq ($(CONFIG_NET),)
 endif # CONFIG_NET
 
 ifneq ($(CONFIG_SND_SOC),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \
-      echo "lttng-probe-asoc.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-asoc.o
 endif # CONFIG_SND_SOC
 
 ifneq ($(CONFIG_EXT3_FS),)
   ext3_dep = $(srctree)/fs/ext3/*.h
   ext3_dep_check = $(wildcard $(ext3_dep))
   ext3 = $(shell \
-    if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
-      if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \
-        -z "$(ext3_dep_check)" ] ; then \
-        echo "warn" ; \
-        exit ; \
+    if [ $(VERSION) -lt 4 -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -lt 3 \) ] ; then \
+      if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \
+        if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \
+          -z "$(ext3_dep_check)" ] ; then \
+          echo "warn" ; \
+          exit ; \
+        fi; \
+        echo "lttng-probe-ext3.o" ; \
       fi; \
-      echo "lttng-probe-ext3.o" ; \
     fi;)
   ifeq ($(ext3),warn)
     $(warning Files $(ext3_dep) not found. Probe "ext3" is disabled. Use full kernel source tree to enable it.)
@@ -125,31 +126,14 @@ ifneq ($(CONFIG_JBD),)
 endif # CONFIG_JBD
 
 ifneq ($(CONFIG_REGULATOR),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \
-      echo "lttng-probe-regulator.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-regulator.o
 endif # CONFIG_REGULATOR
 
 ifneq ($(CONFIG_SCSI),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 35 \) ] ; then \
-      echo "lttng-probe-scsi.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-scsi.o
 endif # CONFIG_SCSI
 
-vmscan = $(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
+obj-$(CONFIG_LTTNG) += lttng-probe-vmscan.o
 
 # lock probe does not work, so disabling it for now
 #ifneq ($(CONFIG_LOCKDEP),)
@@ -158,32 +142,22 @@ endif # CONFIG_SWAP
 
 ifneq ($(CONFIG_BTRFS_FS),)
   btrfs_dep = $(srctree)/fs/btrfs/*.h
-  btrfs = $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 39 \) ] ; then \
-      echo "lttng-probe-btrfs.o" ; fi;)
-  ifneq ($(btrfs),)
-    ifeq ($(wildcard $(btrfs_dep)),)
-      $(warning Files $(btrfs_dep) not found. Probe "btrfs" is disabled. Use full kernel source tree to enable it.)
-      btrfs =
-    endif # $(wildcard $(btrfs_dep))
-  endif # $(btrfs)
-  obj-$(CONFIG_LTTNG) += $(btrfs)
+  ifneq ($(wildcard $(btrfs_dep)),)
+    obj-$(CONFIG_LTTNG) += lttng-probe-btrfs.o
+  else
+    $(warning Files $(btrfs_dep) not found. Probe "btrfs" is disabled. Use full kernel source tree to enable it.)
+  endif # $(wildcard $(btrfs_dep))
 endif # CONFIG_BTRFS_FS
 
-obj-$(CONFIG_LTTNG) +=  $(shell \
-  if [ $(VERSION) -ge 3 \
-    -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 38 \) ] ; then \
-    echo "lttng-probe-compaction.o" ; fi;)
+obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o
 
 ifneq ($(CONFIG_EXT4_FS),)
   ext4_dep = $(srctree)/fs/ext4/*.h
-  ext4 = lttng-probe-ext4.o
-  ifeq ($(wildcard $(ext4_dep)),)
+  ifneq ($(wildcard $(ext4_dep)),)
+    obj-$(CONFIG_LTTNG) += lttng-probe-ext4.o
+  else
     $(warning Files $(ext4_dep) not found. Probe "ext4" is disabled. Use full kernel source tree to enable it.)
-    ext4 =
   endif # $(wildcard $(ext4_dep))
-  obj-$(CONFIG_LTTNG) += $(ext4)
 endif # CONFIG_EXT4_FS
 
 obj-$(CONFIG_LTTNG) +=  $(shell \
@@ -241,26 +215,35 @@ endif # CONFIG_VIDEO_V4L2
 obj-$(CONFIG_LTTNG) += lttng-probe-workqueue.o
 
 ifneq ($(CONFIG_KALLSYMS_ALL),)
-  obj-$(CONFIG_LTTNG) +=  $(shell \
-    if [ $(VERSION) -ge 3 \
-      -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 36 \) ] ; then \
-      echo "lttng-probe-writeback.o" ; fi;)
+  obj-$(CONFIG_LTTNG) += lttng-probe-writeback.o
 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.)
+  ifdef CONFIG_LOCALVERSION # Check if dot-config is included.
+    $(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
 endif # CONFIG_KALLSYMS_ALL
 
 ifneq ($(CONFIG_KPROBES),)
   obj-$(CONFIG_LTTNG) += lttng-kprobes.o
 endif # CONFIG_KPROBES
 
+ifneq ($(CONFIG_UPROBES),)
+  obj-$(CONFIG_LTTNG) += lttng-uprobes.o
+endif # CONFIG_UPROBES
+
 ifneq ($(CONFIG_KRETPROBES),)
   obj-$(CONFIG_LTTNG) += lttng-kretprobes.o
 endif # CONFIG_KRETPROBES
 
 ifneq ($(CONFIG_DYNAMIC_FTRACE),)
-  obj-$(CONFIG_LTTNG) += lttng-ftrace.o
+  ifeq ($(have_ftrace_header),yes)
+    obj-$(CONFIG_LTTNG) += lttng-ftrace.o
+  else
+    $(warning Files $(ftrace_dep) not found. Probe "ftrace" is disabled. Use full kernel source tree to enable it.)
+  endif
 endif # CONFIG_DYNAMIC_FTRACE
 
-obj-$(CONFIG_LTTNG) += lttng-test.o
+ifneq ($(CONFIG_PREEMPTIRQ_EVENTS),)
+  obj-$(CONFIG_LTTNG) += lttng-probe-preemptirq.o
+endif # CONFIG_PREEMPTIRQ_EVENTS
 
 # vim:syntax=make