Fix: lib_ring_buffer_copy_from_user_inatomic error handling

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 1234519a036d8c9f0a9baa1dc8dced92da6a9347..6bf4d2879a8d46d5bed3067b8b3c47f2b629fb82 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,9 +5,13 @@
 ifneq ($(KERNELRELEASE),)
 ifneq ($(CONFIG_TRACEPOINTS),)
 
+KERNELDIR = ${LTTNG_KERNELDIR}
+MAKEFILEDIR = $(shell dirname $(lastword $(MAKEFILE_LIST)))
+
 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
@@ -19,6 +23,8 @@ $(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
 endif
 endif
 
+include $(MAKEFILEDIR)/Makefile.ABI.workarounds
+
 obj-m += lttng-ring-buffer-client-discard.o
 obj-m += lttng-ring-buffer-client-overwrite.o
 obj-m += lttng-ring-buffer-metadata-client.o
@@ -33,20 +39,19 @@ lttng-tracer-objs :=  lttng-events.o lttng-abi.o \
                        lttng-context-prio.o lttng-context-nice.o \
                        lttng-context-vpid.o lttng-context-tid.o \
                        lttng-context-vtid.o lttng-context-ppid.o \
-                       lttng-context-vppid.o lttng-calibrate.o \
+                       lttng-context-vppid.o lttng-context-cpu-id.o \
+                       lttng-calibrate.o \
                        lttng-context-hostname.o wrapper/random.o \
                        probes/lttng.o wrapper/trace-clock.o \
+                       wrapper/page_alloc.o \
                        lttng-tracker-pid.o \
                        lttng-filter.o lttng-filter-interpreter.o \
                        lttng-filter-specialize.o \
-                       lttng-filter-validator.o
-
-obj-m += lttng-statedump.o
-lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
-                       wrapper/fdtable.o
+                       lttng-filter-validator.o \
+                       probes/lttng-probe-user.o
 
 ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
-lttng-tracer-objs += lttng-syscalls.o probes/lttng-probe-user.o
+lttng-tracer-objs += lttng-syscalls.o
 endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
 
 ifneq ($(CONFIG_PERF_EVENTS),)
@@ -57,9 +62,14 @@ lttng-tracer-objs += $(shell \
 endif # CONFIG_PERF_EVENTS
 
 lttng-tracer-objs += $(shell \
-       if [ $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 ] ; then \
+       if [ $(VERSION) -ge 4 \
+               -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 \) ] ; then \
                echo "lttng-tracepoint.o" ; fi;)
 
+obj-m += lttng-statedump.o
+lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
+                       wrapper/fdtable.o
+
 obj-m += probes/
 obj-m += lib/
 
@@ -71,14 +81,14 @@ else # KERNELRELEASE
        CFLAGS = $(EXTCFLAGS)
 
 default:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
 
 modules_install:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
 
 clean:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+       LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
 endif # KERNELRELEASE