diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-24 10:36:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-24 10:36:07 -0500 |
| commit | 1263d736a9031f3d943819662d4bad727d64bf24 (patch) | |
| tree | c740e74d19a0ecadd00bbdb8ad4b5a6b8d297480 /tools/perf/Makefile | |
| parent | 184d3da8ef0ca552dffa0fdd35c046e058a2cf9a (diff) | |
| parent | 12eac0bf0461910ae6dd7f071f156f75461a37cf (diff) | |
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/Makefile | 1 |
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 | |||
| 419 | # Benchmark modules | 419 | # Benchmark modules |
| 420 | BUILTIN_OBJS += bench/sched-messaging.o | 420 | BUILTIN_OBJS += bench/sched-messaging.o |
| 421 | BUILTIN_OBJS += bench/sched-pipe.o | 421 | BUILTIN_OBJS += bench/sched-pipe.o |
| 422 | BUILTIN_OBJS += bench/mem-memcpy.o | ||
| 422 | 423 | ||
| 423 | BUILTIN_OBJS += builtin-help.o | 424 | BUILTIN_OBJS += builtin-help.o |
| 424 | BUILTIN_OBJS += builtin-sched.o | 425 | BUILTIN_OBJS += builtin-sched.o |