projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: update block instrumentation to 3.15 kernel
[lttng-modules.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 2da72989e4c75a27ab4270e891a5b2c6950cadff..606b5ec8b104b756dad0f56e35105c67d43c5907 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-20,7
+20,8
@@
lttng-tracer-objs := lttng-events.o lttng-abi.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-vpid.o lttng-context-tid.o \
lttng-context-vtid.o lttng-context-ppid.o \
lttng-context-vppid.o lttng-calibrate.o \
- lttng-context-hostname.o wrapper/random.o
+ lttng-context-hostname.o wrapper/random.o \
+ probes/lttng.o
obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
obj-m += lttng-statedump.o
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
@@
-28,21
+29,25
@@
lttng-statedump-objs := lttng-statedump-impl.o wrapper/irqdesc.o \
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
lttng-tracer-objs += lttng-syscalls.o probes/lttng-probe-user.o
ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
lttng-tracer-objs += lttng-syscalls.o probes/lttng-probe-user.o
-endif
+endif
# CONFIG_HAVE_SYSCALL_TRACEPOINTS
ifneq ($(CONFIG_PERF_EVENTS),)
lttng-tracer-objs += $(shell \
if [ $(VERSION) -ge 3 \
ifneq ($(CONFIG_PERF_EVENTS),)
lttng-tracer-objs += $(shell \
if [ $(VERSION) -ge 3 \
- -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 3
4
\) ] ; then \
+ -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -ge 6 -a $(SUBLEVEL) -ge 3
3
\) ] ; then \
echo "lttng-context-perf-counters.o" ; fi;)
echo "lttng-context-perf-counters.o" ; fi;)
-endif
+endif # CONFIG_PERF_EVENTS
+
+lttng-tracer-objs += $(shell \
+ if [ $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 15 -a $(SUBLEVEL) -ge 0 ] ; then \
+ echo "lttng-tracepoint.o" ; fi;)
obj-m += probes/
obj-m += lib/
obj-m += probes/
obj-m += lib/
-endif
+endif
# CONFIG_TRACEPOINTS
-else
+else
# KERNELRELEASE
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
CFLAGS = $(EXTCFLAGS)
KERNELDIR ?= /lib/modules/$(shell uname -r)/build
PWD := $(shell pwd)
CFLAGS = $(EXTCFLAGS)
@@
-58,4
+63,4
@@
clean:
%.i: %.c
$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
%.i: %.c
$(MAKE) -C $(KERNELDIR) M=$(PWD) $@
-endif
+endif
# KERNELRELEASE
This page took
0.023825 seconds
and
4
git commands to generate.