summaryrefslogtreecommitdiffstats
path: root/tools/perf/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-11-24 16:36:03 +0100
committerIngo Molnar <mingo@elte.hu>2009-11-24 16:36:07 +0100
commit1263d736a9031f3d943819662d4bad727d64bf24 (patch)
treec740e74d19a0ecadd00bbdb8ad4b5a6b8d297480 /tools/perf/Makefile
parent184d3da8ef0ca552dffa0fdd35c046e058a2cf9a (diff)
parent12eac0bf0461910ae6dd7f071f156f75461a37cf (diff)
downloadlinux-1263d736a9031f3d943819662d4bad727d64bf24.tar.gz
linux-1263d736a9031f3d943819662d4bad727d64bf24.tar.bz2
linux-1263d736a9031f3d943819662d4bad727d64bf24.zip
Merge branch 'perf/bench' into perf/core
Merge reason: Looks mergable - ready it for the merge window. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/Makefile')
-rw-r--r--tools/perf/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 3ef6621bf6cd..f1537a94a05f 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -419,6 +419,7 @@ BUILTIN_OBJS += builtin-bench.o
# Benchmark modules
BUILTIN_OBJS += bench/sched-messaging.o
BUILTIN_OBJS += bench/sched-pipe.o
+BUILTIN_OBJS += bench/mem-memcpy.o
BUILTIN_OBJS += builtin-help.o
BUILTIN_OBJS += builtin-sched.o