Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf version: Use regular verbose flag

Remove additional version_verbose flag by using the existing verbose
variable.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Chengdong Li <chengdongli@tencent.com>
Cc: Denis Nikitin <denik@chromium.org>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Raul Silvera <rsilvera@google.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230410162511.3055900-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
2176f9e2 8641661c

+3 -5
+2 -3
tools/perf/builtin-version.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 #include "builtin.h" 3 3 #include "color.h" 4 + #include "util/debug.h" 4 5 #include "util/header.h" 5 6 #include <tools/config.h> 6 7 #include <stdbool.h> 7 8 #include <stdio.h> 8 9 #include <string.h> 9 10 #include <subcmd/parse-options.h> 10 - 11 - int version_verbose; 12 11 13 12 struct version { 14 13 bool build_options; ··· 91 92 92 93 printf("perf version %s\n", perf_version_string); 93 94 94 - if (version.build_options || version_verbose == 1) 95 + if (version.build_options || verbose > 0) 95 96 library_status(); 96 97 97 98 return 0;
+1 -1
tools/perf/perf.c
··· 212 212 213 213 if (!strcmp(cmd, "-vv")) { 214 214 (*argv)[0] = "version"; 215 - version_verbose = 1; 215 + verbose = 1; 216 216 break; 217 217 } 218 218
-1
tools/perf/perf.h
··· 18 18 PERF_AFFINITY_MAX 19 19 }; 20 20 21 - extern int version_verbose; 22 21 #endif