X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2FKbuild;h=0eba20d81b3db8f0fecf33a2ff024e5155048627;hb=eec143a1bec2bebc1c62faab8af96160eb47ece5;hp=e3896e8125b212fc5eab6754011aeea3261a08b6;hpb=a101fa100885861be33fab3966db2c5136815724;p=lttng-modules.git

diff --git a/src/Kbuild b/src/Kbuild
index e3896e81..0eba20d8 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -1,8 +1,28 @@
 # SPDX-License-Identifier: (GPL-2.0-only or LGPL-2.1-only)
 
+ifdef CONFIG_LOCALVERSION	# Check if dot-config is included.
+  ifeq ($(CONFIG_TRACEPOINTS),)
+    $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration)
+  endif # CONFIG_TRACEPOINTS
+endif # ifdef CONFIG_LOCALVERSION
+
 TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))/..
 
-include $(TOP_LTTNG_MODULES_DIR)/Kbuild.common
+lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
+
+#
+# Check for stale version.h, which can be a leftover from an old Linux
+# kernel tree moved to a newer kernel version, only pruned by make
+# distclean.
+#
+ifneq ($(wildcard $(lttng_check_linux_version)),)
+  ifneq ($(wildcard $(lttng_check_generated_linux_version)),)
+    $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lttng_check_generated_linux_version). Consider running make distclean on your kernel, or removing the stale $(lttng_check_linux_version) file)
+  endif
+endif
+
+include $(TOP_LTTNG_MODULES_DIR)/src/Kbuild.common
 
 ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)/include
 
@@ -47,8 +67,9 @@ lttng-tracer-objs := lib/msgpack/msgpack.o \
                      lttng-context-vsgid.o \
                      lttng-context-interruptible.o \
                      lttng-context-need-reschedule.o \
-                     lttng-context-callstack.o lttng-calibrate.o \
+                     lttng-calibrate.o \
                      lttng-context-hostname.o \
+		     lttng-context-callstack.o \
                      probes/lttng.o \
                      lttng-tracker-id.o \
                      lttng-bytecode.o lttng-bytecode-interpreter.o \
@@ -64,10 +85,16 @@ lttng-wrapper-objs := wrapper/page_alloc.o \
                       wrapper/kallsyms.o \
                       wrapper/irqdesc.o \
                       wrapper/fdtable.o \
+                      wrapper/genhd.o \
                       lttng-wrapper-impl.o
 
 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
   lttng-tracer-objs += lttng-syscalls.o
+  lttng-tracer-objs += lttng-syscalls-entry-table.o
+  lttng-tracer-objs += lttng-syscalls-entry-compat-table.o
+  lttng-tracer-objs += lttng-syscalls-exit-table.o
+  lttng-tracer-objs += lttng-syscalls-exit-compat-table.o
+  lttng-tracer-objs += lttng-syscalls-enum.o
 endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
 ifneq ($(CONFIG_PERF_EVENTS),)
@@ -123,3 +150,4 @@ lttng-statedump-objs := lttng-statedump-impl.o
 
 obj-$(CONFIG_LTTNG) += probes/
 obj-$(CONFIG_LTTNG) += lib/
+obj-$(CONFIG_LTTNG) += tests/