diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:06:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-21 06:06:12 -0400 |
| commit | 0a11953851213fd1d3eebcb68b4a537d458c70c2 (patch) | |
| tree | 3f6f7cae25b8c1a81d6f37b1ecfff5a45bb9df40 /Makefile | |
| parent | 3bf2391729822e591dcfbbd1e9dd2f450968cdcb (diff) | |
| parent | bc96b361cbf90e61d2665b1305cd2c4ac1fd9cfc (diff) | |
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 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1331,11 +1331,11 @@ kernelversion: | |||
| 1331 | # Clear a bunch of variables before executing the submake | 1331 | # Clear a bunch of variables before executing the submake |
| 1332 | tools/: FORCE | 1332 | tools/: FORCE |
| 1333 | $(Q)mkdir -p $(objtree)/tools | 1333 | $(Q)mkdir -p $(objtree)/tools |
| 1334 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ | 1334 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ |
| 1335 | 1335 | ||
| 1336 | tools/%: FORCE | 1336 | tools/%: FORCE |
| 1337 | $(Q)mkdir -p $(objtree)/tools | 1337 | $(Q)mkdir -p $(objtree)/tools |
| 1338 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS= O=$(objtree) subdir=tools -C $(src)/tools/ $* | 1338 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $* |
| 1339 | 1339 | ||
| 1340 | # Single targets | 1340 | # Single targets |
| 1341 | # --------------------------------------------------------------------------- | 1341 | # --------------------------------------------------------------------------- |