X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=Makefile;h=581b5a241b0d1810c6f0ed7992ae323d1488c570;hb=refs%2Fheads%2Fstable-2.4;hp=fcb14f2fcefc45710e67d50b33f887548ec459d6;hpb=699f9673466e1a6537ad23cc697b79660639f260;p=lttng-modules.git

diff --git a/Makefile b/Makefile
index fcb14f2f..581b5a24 100644
--- a/Makefile
+++ b/Makefile
@@ -3,14 +3,21 @@
 #
 
 ifneq ($(KERNELRELEASE),)
+ifneq ($(CONFIG_TRACEPOINTS),)
 
-ifeq ($(CONFIG_TRACEPOINTS),)
-
-$(error You need to enable CONFIG_TRACEPOINTS in kernel!)
-
-endif #CONFIG_TRACEPOINTS
+lttng_check_linux_version = $(shell pwd)/include/linux/version.h
+lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
 
-ifneq ($(CONFIG_TRACEPOINTS),)
+#
+# 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
 
 obj-m += lttng-ring-buffer-client-discard.o
 obj-m += lttng-ring-buffer-client-overwrite.o
@@ -40,7 +47,7 @@ endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
 ifneq ($(CONFIG_PERF_EVENTS),)
 lttng-tracer-objs += $(shell \
 	if [ $(VERSION) -ge 3 \
-		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 34 \) ] ; then \
+		-o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \
 		echo "lttng-context-perf-counters.o" ; fi;)
 endif # CONFIG_PERF_EVENTS