[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-vcz4ufzdon7cwy8dm2ua53xk@git.kernel.org>
Date: Tue, 18 Dec 2018 05:48:20 -0800
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: wangnan0@...wei.com, mathieu.poirier@...aro.org,
linux-kernel@...r.kernel.org, ak@...ux.intel.com,
leo.yan@...aro.org, acme@...hat.com, namhyung@...nel.org,
mingo@...nel.org, jolsa@...hat.com, adrian.hunter@...el.com,
dsahern@...il.com, davem@...emloft.net, hpa@...or.com,
tglx@...utronix.de
Subject: [tip:perf/core] perf env: Also consider env->arch == NULL as local
operation
Commit-ID: 804234f27180dcf9a25cb98a88d5212f65b7f3fd
Gitweb: https://git.kernel.org/tip/804234f27180dcf9a25cb98a88d5212f65b7f3fd
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Tue, 27 Nov 2018 11:45:49 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Mon, 17 Dec 2018 14:54:02 -0300
perf env: Also consider env->arch == NULL as local operation
We'll set a new machine field based on env->arch, which for live mode,
like with 'perf top' means we need to use uname() to figure the name of
the arch, fix perf_env__arch() to consider both (env == NULL) and
(env->arch == NULL) as local operation.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: Andi Kleen <ak@...ux.intel.com>
Cc: David Ahern <dsahern@...il.com>
Cc: David S. Miller <davem@...emloft.net>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Leo Yan <leo.yan@...aro.org>
Cc: Mathieu Poirier <mathieu.poirier@...aro.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Cc: stable@...r.kernel.org # 4.19
Link: https://lkml.kernel.org/n/tip-vcz4ufzdon7cwy8dm2ua53xk@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/env.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 59f38c7693f8..4c23779e271a 100644
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -166,7 +166,7 @@ const char *perf_env__arch(struct perf_env *env)
struct utsname uts;
char *arch_name;
- if (!env) { /* Assume local operation */
+ if (!env || !env->arch) { /* Assume local operation */
if (uname(&uts) < 0)
return NULL;
arch_name = uts.machine;
Powered by blists - more mailing lists