projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: context printk mismatch on error
[lttng-modules.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 23049ca34582b5e3f22e5b28465145c6111319c2..b1bc6b95f953366472d7b4559b17970bc4fad881 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-5,6
+5,8
@@
ifneq ($(KERNELRELEASE),)
ifneq ($(CONFIG_TRACEPOINTS),)
ifneq ($(KERNELRELEASE),)
ifneq ($(CONFIG_TRACEPOINTS),)
+KERNELDIR=${LTTNG_KERNELDIR}
+
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
lttng_check_linux_version = $(shell pwd)/include/linux/version.h
lttng_check_generated_linux_version = $(shell pwd)/include/generated/uapi/linux/version.h
@@
-19,6
+21,8
@@
$(error Duplicate version.h files found in $(lttng_check_linux_version) and $(lt
endif
endif
endif
endif
+include $(KBUILD_EXTMOD)/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
obj-m += lttng-ring-buffer-client-discard.o
obj-m += lttng-ring-buffer-client-overwrite.o
obj-m += lttng-ring-buffer-metadata-client.o
@@
-36,14
+40,19
@@
lttng-tracer-objs := lttng-events.o lttng-abi.o \
lttng-context-vppid.o lttng-calibrate.o \
lttng-context-hostname.o wrapper/random.o \
probes/lttng.o wrapper/trace-clock.o \
lttng-context-vppid.o lttng-calibrate.o \
lttng-context-hostname.o wrapper/random.o \
probes/lttng.o wrapper/trace-clock.o \
- lttng-tracker-pid.o
+ wrapper/page_alloc.o \
+ lttng-tracker-pid.o \
+ lttng-filter.o lttng-filter-interpreter.o \
+ lttng-filter-specialize.o \
+ lttng-filter-validator.o \
+ probes/lttng-probe-user.o
obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
wrapper/fdtable.o
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
wrapper/fdtable.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),)
endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS
ifneq ($(CONFIG_PERF_EVENTS),)
@@
-54,7
+63,8
@@
lttng-tracer-objs += $(shell \
endif # CONFIG_PERF_EVENTS
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 += probes/
echo "lttng-tracepoint.o" ; fi;)
obj-m += probes/
@@
-68,14
+78,14
@@
else # KERNELRELEASE
CFLAGS = $(EXTCFLAGS)
default:
CFLAGS = $(EXTCFLAGS)
default:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) modules
modules_install:
modules_install:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install
clean:
clean:
- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) clean
%.i: %.c
%.i: %.c
- $(MAKE) -C $(KERNELDIR) M=$(PWD) $@
+
LTTNG_KERNELDIR=$(KERNELDIR)
$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
endif # KERNELRELEASE
endif # KERNELRELEASE
This page took
0.025435 seconds
and
4
git commands to generate.