projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6f5e357
1c69818
)
Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf...
author
Ingo Molnar
<mingo@kernel.org>
Mon, 21 May 2012 08:42:09 +0000
(10:42 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 21 May 2012 08:42:09 +0000
(10:42 +0200)
Conflicts:
tools/perf/Makefile
This tree from Frederic unifies the perf and trace-cmd trace event format
parsing code into a single library.
Powertop and other tools will also be able to make use of it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1
2
tools/perf/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/perf/Makefile
index 398094c3d3c997f51d91083d4a4b6ee9e192f785,af0e5d64a9f794f9079147af02257b85a9ad06db..fa37cd53e9b9f7b538641e2e8666657fd99ca9ac
---
1
/
tools/perf/Makefile
---
2
/
tools/perf/Makefile
+++ b/
tools/perf/Makefile
@@@
-300,7
-311,7
+311,8
@@@
LIB_H += util/cpumap.
LIB_H += util/top.h
LIB_H += $(ARCH_INCLUDE)
LIB_H += util/cgroup.h
+ LIB_H += $(EVENT_PARSE_DIR)event-parse.h
+LIB_H += util/target.h
LIB_OBJS += $(OUTPUT)util/abspath.o
LIB_OBJS += $(OUTPUT)util/alias.o