diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-21 10:42:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-21 10:42:09 +0200 |
| commit | 73787190d04a34e6da745da893b3ae8bedde418f (patch) | |
| tree | bc1046eb1864237741898992673f17c577b83929 /tools/scripts | |
| parent | Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | parse-events: Rename struct record to struct pevent_record (diff) | |
| download | linux-73787190d04a34e6da745da893b3ae8bedde418f.tar.xz linux-73787190d04a34e6da745da893b3ae8bedde418f.zip | |
Merge branch 'perf/parse-events-4' of git://github.com/fweisbec/tracing into perf/core
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>
Diffstat (limited to 'tools/scripts')
| -rw-r--r-- | tools/scripts/Makefile.include | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index 87b55a729a5f..bde8521d56bb 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -1,5 +1,6 @@ ifeq ("$(origin O)", "command line") OUTPUT := $(O)/ + COMMAND_O := O=$(O) endif ifneq ($(OUTPUT),) |