diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 11:06:12 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 11:06:12 +0100 |
| commit | 0a11953851213fd1d3eebcb68b4a537d458c70c2 (patch) | |
| tree | 3f6f7cae25b8c1a81d6f37b1ecfff5a45bb9df40 /tools/Makefile | |
| parent | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (diff) | |
| parent | bc96b361cbf90e61d2665b1305cd2c4ac1fd9cfc (diff) | |
| download | linux-3.10-0a11953851213fd1d3eebcb68b4a537d458c70c2.tar.gz linux-3.10-0a11953851213fd1d3eebcb68b4a537d458c70c2.tar.bz2 linux-3.10-0a11953851213fd1d3eebcb68b4a537d458c70c2.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Conflicts:
tools/Makefile
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
. Honor parallel jobs, fix from Borislav Petkov
. Introduce tools/lib/lk library, initially just removing duplication
among tools/perf and tools/vm. from Borislav Petkov
. Fix build on non-glibc systems due to libio.h absence, from Cody P Schafer.
. Remove some perf_session and tracing dead code, from David Ahern.
. Introduce perf stat --repeat forever, from Frederik Deweerdt.
. Add perf test entries for checking --cpu in record and stat, from Jiri Olsa.
. Add perf test entries for checking breakpoint overflow signal handler issues,
from Jiri Olsa.
. Add perf test entry for for checking number of EXIT events, from Namhyung Kim.
. Simplify some perf_evlist methods and to allow 'stat' to share code with
'record' and 'trace'.
. Remove dead code in related to libtraceevent integration, from Namhyung Kim.
. Event group view for 'annotate' in --stdio, --tui and --gtk, from Namhyung Kim.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
[ resolved the trivial merge conflict with upstream ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index fa36565b209..6aaeb6cd867 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -34,7 +34,13 @@ help: cpupower: FORCE $(call descend,power/$@) -cgroup firewire lguest perf usb virtio vm: FORCE +cgroup firewire guest usb virtio vm: FORCE + $(call descend,$@) + +liblk: FORCE + $(call descend,lib/lk) + +perf: liblk FORCE $(call descend,$@) selftests: FORCE @@ -62,7 +68,13 @@ install: cgroup_install cpupower_install firewire_install lguest_install \ cpupower_clean: $(call descend,power/cpupower,clean) -cgroup_clean firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean: +cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean: + $(call descend,$(@:_clean=),clean) + +liblk_clean: + $(call descend,lib/lk,clean) + +perf_clean: liblk_clean $(call descend,$(@:_clean=),clean) selftests_clean: |