aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar2017-02-01 08:32:36 -0600
committerIngo Molnar2017-02-01 08:33:25 -0600
commitd7cb3a507d23ef42574709fc5f2ca954e274ff91 (patch)
tree59e92e79a9afb5e7bc8e75c39f88cbffcad382e4 /Makefile
parent5443624bedd0d23e112d5f2a919435182875bce9 (diff)
parentb05d1093987a78695766b71a2d723aa65b5c25c5 (diff)
downloadkernel-d7cb3a507d23ef42574709fc5f2ca954e274ff91.tar.gz
kernel-d7cb3a507d23ef42574709fc5f2ca954e274ff91.tar.xz
kernel-d7cb3a507d23ef42574709fc5f2ca954e274ff91.zip
Merge tag 'perf-core-for-mingo-4.11-20170201' 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: New features: - Allow configuring a 'perf ftrace' default --tracer (Taeung Song) Infrastructure changes: - Sync tools/arch/{powerpc,arm}/include/uapi/asm/kvm.h and tools/arch/x86/include/asm/cpufeatures.h (Ingo Molnar) - Add BPF program file system pinning APIs and respective 'perf test' entry (Joe Stringer) - Make tools tree support 'make -s' (Josh Poimboeuf) - Reference count maps in callchains, fixing SEGFAULT when referencing maps after it is freed (Krister Johansen) - Create for_each_event trace points iterator (Taeung Song) - Do not consider an error not to have any perfconfig file (Arnaldo Carvalho de Melo - Propagate perf_config() errors (Arnaldo Carvalho de Melo) 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--Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 96b27a888285..b29c8043614b 100644
--- a/Makefile
+++ b/Makefile
@@ -87,10 +87,12 @@ endif
87ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4 87ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
88ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),) 88ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
89 quiet=silent_ 89 quiet=silent_
90 tools_silent=s
90endif 91endif
91else # make-3.8x 92else # make-3.8x
92ifneq ($(filter s% -s%,$(MAKEFLAGS)),) 93ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
93 quiet=silent_ 94 quiet=silent_
95 tools_silent=-s
94endif 96endif
95endif 97endif
96 98
@@ -1607,11 +1609,11 @@ image_name:
1607# Clear a bunch of variables before executing the submake 1609# Clear a bunch of variables before executing the submake
1608tools/: FORCE 1610tools/: FORCE
1609 $(Q)mkdir -p $(objtree)/tools 1611 $(Q)mkdir -p $(objtree)/tools
1610 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ 1612 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/
1611 1613
1612tools/%: FORCE 1614tools/%: FORCE
1613 $(Q)mkdir -p $(objtree)/tools 1615 $(Q)mkdir -p $(objtree)/tools
1614 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $* 1616 $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*
1615 1617
1616# Single targets 1618# Single targets
1617# --------------------------------------------------------------------------- 1619# ---------------------------------------------------------------------------