Skip to content

Commit 42367ec

Browse files
charlie-rivosacmel
authored andcommitted
tools: Remove redundant quiet setup
Q is exported from Makefile.include so it is not necessary to manually set it. Reviewed-by: Jiri Olsa <[email protected]> Signed-off-by: Charlie Jenkins <[email protected]> Acked-by: Andrii Nakryiko <[email protected]> Acked-by: Quentin Monnet <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Benjamin Tissoires <[email protected]> Cc: Daniel Borkmann <[email protected]> Cc: Daniel Lezcano <[email protected]> Cc: Eduard Zingerman <[email protected]> Cc: Hao Luo <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: John Fastabend <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: KP Singh <[email protected]> Cc: Lukasz Luba <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Martin KaFai Lau <[email protected]> Cc: Mykola Lysenko <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Shuah Khan <[email protected]> Cc: Song Liu <[email protected]> Cc: Stanislav Fomichev <[email protected]> Cc: Steven Rostedt (VMware) <[email protected]> Cc: Yonghong Song <[email protected]> Cc: Zhang Rui <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 293f324 commit 42367ec

File tree

16 files changed

+1
-114
lines changed

16 files changed

+1
-114
lines changed

tools/arch/arm64/tools/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@ AWK ?= awk
1313
MKDIR ?= mkdir
1414
RM ?= rm
1515

16-
ifeq ($(V),1)
17-
Q =
18-
else
19-
Q = @
20-
endif
21-
2216
arm64_tools_dir = $(top_srcdir)/arch/arm64/tools
2317
arm64_sysreg_tbl = $(arm64_tools_dir)/sysreg
2418
arm64_gen_sysreg = $(arm64_tools_dir)/gen-sysreg.awk

tools/bpf/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ srctree := $(patsubst %/,%,$(dir $(CURDIR)))
2727
srctree := $(patsubst %/,%,$(dir $(srctree)))
2828
endif
2929

30-
ifeq ($(V),1)
31-
Q =
32-
else
33-
Q = @
34-
endif
35-
3630
FEATURE_USER = .bpf
3731
FEATURE_TESTS = libbfd disassembler-four-args disassembler-init-styled
3832
FEATURE_DISPLAY = libbfd

tools/bpf/bpftool/Documentation/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ INSTALL ?= install
55
RM ?= rm -f
66
RMDIR ?= rmdir --ignore-fail-on-non-empty
77

8-
ifeq ($(V),1)
9-
Q =
10-
else
11-
Q = @
12-
endif
13-
148
prefix ?= /usr/local
159
mandir ?= $(prefix)/man
1610
man8dir = $(mandir)/man8

tools/bpf/bpftool/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
77
srctree := $(patsubst %/,%,$(dir $(srctree)))
88
endif
99

10-
ifeq ($(V),1)
11-
Q =
12-
else
13-
Q = @
14-
endif
15-
1610
BPF_DIR = $(srctree)/tools/lib/bpf
1711

1812
ifneq ($(OUTPUT),)

tools/bpf/resolve_btfids/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ include ../../scripts/Makefile.arch
55
srctree := $(abspath $(CURDIR)/../../../)
66

77
ifeq ($(V),1)
8-
Q =
98
msg =
109
else
11-
Q = @
1210
ifeq ($(silent),1)
1311
msg =
1412
else

tools/bpf/runqslower/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ VMLINUX_BTF_PATHS := $(if $(O),$(O)/vmlinux) \
2626
VMLINUX_BTF_PATH := $(or $(VMLINUX_BTF),$(firstword \
2727
$(wildcard $(VMLINUX_BTF_PATHS))))
2828

29-
ifeq ($(V),1)
30-
Q =
31-
else
32-
Q = @
29+
ifneq ($(V),1)
3330
MAKEFLAGS += --no-print-directory
3431
submake_extras := feature_display=0
3532
endif

tools/lib/bpf/Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ include $(srctree)/tools/scripts/Makefile.include
5353

5454
# copy a bit from Linux kbuild
5555

56-
ifeq ("$(origin V)", "command line")
57-
VERBOSE = $(V)
58-
endif
59-
ifndef VERBOSE
60-
VERBOSE = 0
61-
endif
62-
6356
INCLUDES = -I$(or $(OUTPUT),.) \
6457
-I$(srctree)/tools/include -I$(srctree)/tools/include/uapi \
6558
-I$(srctree)/tools/arch/$(SRCARCH)/include
@@ -96,12 +89,6 @@ override CFLAGS += $(CLANG_CROSS_FLAGS)
9689
# flags specific for shared library
9790
SHLIB_FLAGS := -DSHARED -fPIC
9891

99-
ifeq ($(VERBOSE),1)
100-
Q =
101-
else
102-
Q = @
103-
endif
104-
10592
# Disable command line variables (CFLAGS) override from top
10693
# level Makefile (perf), otherwise build Makefile will get
10794
# the same command line setup.

tools/lib/perf/Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ libdir = $(prefix)/$(libdir_relative)
3939
libdir_SQ = $(subst ','\'',$(libdir))
4040
libdir_relative_SQ = $(subst ','\'',$(libdir_relative))
4141

42-
ifeq ("$(origin V)", "command line")
43-
VERBOSE = $(V)
44-
endif
45-
ifndef VERBOSE
46-
VERBOSE = 0
47-
endif
48-
49-
ifeq ($(VERBOSE),1)
50-
Q =
51-
else
52-
Q = @
53-
endif
54-
5542
TEST_ARGS := $(if $(V),-v)
5643

5744
# Set compile option CFLAGS

tools/lib/thermal/Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ libdir = $(prefix)/$(libdir_relative)
3939
libdir_SQ = $(subst ','\'',$(libdir))
4040
libdir_relative_SQ = $(subst ','\'',$(libdir_relative))
4141

42-
ifeq ("$(origin V)", "command line")
43-
VERBOSE = $(V)
44-
endif
45-
ifndef VERBOSE
46-
VERBOSE = 0
47-
endif
48-
49-
ifeq ($(VERBOSE),1)
50-
Q =
51-
else
52-
Q = @
53-
endif
54-
5542
# Set compile option CFLAGS
5643
ifdef EXTRA_CFLAGS
5744
CFLAGS := $(EXTRA_CFLAGS)

tools/objtool/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)"
4646
AWK = awk
4747
MKDIR = mkdir
4848

49-
ifeq ($(V),1)
50-
Q =
51-
else
52-
Q = @
53-
endif
54-
5549
BUILD_ORC := n
5650

5751
ifeq ($(SRCARCH),x86)

0 commit comments

Comments
 (0)