lttng-modules v0.19-stable: setup_trace_write: Fix recursive locking

[lttng-modules.git] / probes / Makefile

diff --git a/probes/Makefile b/probes/Makefile
index d8f1c40309599f443a69246c65eb7834190bc869..c6f762b5d102d41a447900c85b055d211bb85984 100644 (file)
--- a/probes/Makefile
+++ b/probes/Makefile
@@ -5,16 +5,22 @@ CFLAGS_REMOVE_kernel-trace.o = -pg
 CFLAGS_REMOVE_mm-trace.o = -pg
 CFLAGS_REMOVE_fs-trace.o = -pg
 CFLAGS_REMOVE_ipc-trace.o = -pg
-CFLAGS_REMOVE_lockdep-trace.o = -pg
 CFLAGS_REMOVE_rcu-trace.o = -pg
 CFLAGS_REMOVE_syscall-trace.o = -pg
 CFLAGS_REMOVE_trap-trace.o = -pg
 CFLAGS_REMOVE_pm-trace.o = -pg
 endif
 
-obj-m += kernel-trace.o mm-trace.o fs-trace.o ipc-trace.o lockdep-trace.o \
+obj-m += kernel-trace.o mm-trace.o fs-trace.o ipc-trace.o \
         rcu-trace.o syscall-trace.o trap-trace.o pm-trace.o
 
+ifdef CONFIG_LOCKDEP
+ifdef CONFIG_FTRACE
+CFLAGS_REMOVE_lockdep-trace.o = -pg
+endif
+obj-m += lockdep-trace.o
+endif
+
 ifeq ($(CONFIG_NET),y)
 ifdef CONFIG_FTRACE
 CFLAGS_REMOVE_net-trace.o = -pg
@@ -44,4 +50,10 @@ endif
 obj-m += block-trace.o
 endif
 
+ifdef CONFIG_KVM
+ifdef CONFIG_FTRACE
+CFLAGS_REMOVE_kvm-trace.o = -pg
+endif
+obj-m += kvm-trace.o
+endif