Commit 9f5270d7 authored Feb 25, 2025 by Linus Torvalds

Merge tag 'perf-tools-fixes-for-v6.14-2-2025-02-25' of...

Merge tag 'perf-tools-fixes-for-v6.14-2-2025-02-25' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix tools/ quiet build Makefile infrastructure that was broken when
   working on tools/perf/ without testing on other tools/ living
   utilities.

* tag 'perf-tools-fixes-for-v6.14-2-2025-02-25' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
  tools: Remove redundant quiet setup
  tools: Unify top-level quiet infrastructure

parents cc8a0934 42367eca

tools/arch/arm64/tools/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -13,12 +13,6 @@ AWK ?= awk
		MKDIR ?= mkdir
		RM ?= rm

		ifeq ($(V),1)
		Q =
		else
		Q = @
		endif

		arm64_tools_dir = $(top_srcdir)/arch/arm64/tools
		arm64_sysreg_tbl = $(arm64_tools_dir)/sysreg
		arm64_gen_sysreg = $(arm64_tools_dir)/gen-sysreg.awk

tools/bpf/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -27,12 +27,6 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		endif

		ifeq ($(V),1)
		Q =
		else
		Q = @
		endif

		FEATURE_USER = .bpf
		FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
		FEATURE_DISPLAY = libbfd

tools/bpf/bpftool/Documentation/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -5,12 +5,6 @@ INSTALL ?= install
		RM ?= rm -f
		RMDIR ?= rmdir --ignore-fail-on-non-empty

		ifeq ($(V),1)
		Q =
		else
		Q = @
		endif

		prefix ?= /usr/local
		mandir ?= $(prefix)/man
		man8dir = $(mandir)/man8

tools/bpf/bpftool/Makefile

+0 −6

Original line number	Diff line number	Diff line
		@@ -7,12 +7,6 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		endif

		ifeq ($(V),1)
		Q =
		else
		Q = @
		endif

		BPF_DIR = $(srctree)/tools/lib/bpf

		ifneq ($(OUTPUT),)

tools/bpf/resolve_btfids/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -5,10 +5,8 @@ include ../../scripts/Makefile.arch
		srctree := $(abspath $(CURDIR)/../../../)

		ifeq ($(V),1)
		Q =
		msg =
		else
		Q = @
		ifeq ($(silent),1)
		msg =
		else