diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-05 22:42:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-05 22:42:12 -0400 |
| commit | 1836ac856e4fb446e48afa4f8cae897d4856b06c (patch) | |
| tree | 1b5da329b15a09e13189801c82266fb6805a90af /Makefile | |
| parent | 5ebe6afaf0057ac3eaeb98defd5456894b446d22 (diff) | |
| parent | 3698dab1c849c7e1cd440df4fca24baa1973d53b (diff) | |
Merge tag 'perf-core-for-mingo-3' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
- Improve --filter support for 'perf probe', allowing using its arguments
on other commands, as --add, --del, etc (Masami Hiramatsu)
- Show warning when running 'perf kmem stat' on a unsuitable perf.data file,
i.e. one with events that are not the ones required for the stat variant
used (Namhyung Kim).
Infrastructure changes:
- Auxtrace support patches, paving the way to support Intel PT and BTS (Adrian Hunter)
- hists browser (top, report) refactorings (Namhyung Kim)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
| @@ -215,7 +215,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) | |||
| 215 | 215 | ||
| 216 | export srctree objtree VPATH | 216 | export srctree objtree VPATH |
| 217 | 217 | ||
| 218 | |||
| 219 | # SUBARCH tells the usermode build what the underlying arch is. That is set | 218 | # SUBARCH tells the usermode build what the underlying arch is. That is set |
| 220 | # first, and if a usermode build is happening, the "ARCH=um" on the command | 219 | # first, and if a usermode build is happening, the "ARCH=um" on the command |
| 221 | # line overrides the setting of ARCH below. If a native build is happening, | 220 | # line overrides the setting of ARCH below. If a native build is happening, |
| @@ -1497,11 +1496,11 @@ image_name: | |||
| 1497 | # Clear a bunch of variables before executing the submake | 1496 | # Clear a bunch of variables before executing the submake |
| 1498 | tools/: FORCE | 1497 | tools/: FORCE |
| 1499 | $(Q)mkdir -p $(objtree)/tools | 1498 | $(Q)mkdir -p $(objtree)/tools |
| 1500 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ | 1499 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ |
| 1501 | 1500 | ||
| 1502 | tools/%: FORCE | 1501 | tools/%: FORCE |
| 1503 | $(Q)mkdir -p $(objtree)/tools | 1502 | $(Q)mkdir -p $(objtree)/tools |
| 1504 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $* | 1503 | $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $* |
| 1505 | 1504 | ||
| 1506 | # Single targets | 1505 | # Single targets |
| 1507 | # --------------------------------------------------------------------------- | 1506 | # --------------------------------------------------------------------------- |