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 branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
trace
/
Makefile
diff --git
a/kernel/trace/Makefile
b/kernel/trace/Makefile
index 31cd5fbc0eedfd537891bac6a503256fad1d37d8..05c9182061dece9b818a8574016d58429fb65162 100644
(file)
--- a/
kernel/trace/Makefile
+++ b/
kernel/trace/Makefile
@@
-35,5
+35,6
@@
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += trace_functions_graph.o
obj-$(CONFIG_TRACE_BRANCH_PROFILING) += trace_branch.o
obj-$(CONFIG_HW_BRANCH_TRACER) += trace_hw_branches.o
obj-$(CONFIG_POWER_TRACER) += trace_power.o
+obj-$(CONFIG_KMEMTRACE) += kmemtrace.o
libftrace-y := ftrace.o