projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream-3.16-rc1-v2' of git://git.infradead.org/linux-ubifs
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
Makefile
diff --git
a/kernel/trace/Makefile
b/kernel/trace/Makefile
index 1378e84fbe39c314ebb829fb9df2b4c378244110..2611613f14f15017d4fac1866407ebaa19dcc48a 100644
(file)
--- a/
kernel/trace/Makefile
+++ b/
kernel/trace/Makefile
@@
-17,6
+17,7
@@
ifdef CONFIG_TRACING_BRANCHES
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
endif
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
endif
+CFLAGS_trace_benchmark.o := -I$(src)
CFLAGS_trace_events_filter.o := -I$(src)
obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o
CFLAGS_trace_events_filter.o := -I$(src)
obj-$(CONFIG_TRACE_CLOCK) += trace_clock.o
@@
-62,4
+63,6
@@
endif
obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o
obj-$(CONFIG_UPROBE_EVENT) += trace_uprobe.o
obj-$(CONFIG_PROBE_EVENTS) += trace_probe.o
obj-$(CONFIG_UPROBE_EVENT) += trace_uprobe.o
+obj-$(CONFIG_TRACEPOINT_BENCHMARK) += trace_benchmark.o
+
libftrace-y := ftrace.o
libftrace-y := ftrace.o