summaryrefslogtreecommitdiffstats
path: root/kernel/tools/perf/arch/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/tools/perf/arch/common.c')
-rw-r--r--kernel/tools/perf/arch/common.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel/tools/perf/arch/common.c b/kernel/tools/perf/arch/common.c
index 49776f190..e83c8ce24 100644
--- a/kernel/tools/perf/arch/common.c
+++ b/kernel/tools/perf/arch/common.c
@@ -61,7 +61,7 @@ const char *const mips_triplets[] = {
static bool lookup_path(char *name)
{
bool found = false;
- char *path, *tmp;
+ char *path, *tmp = NULL;
char buf[PATH_MAX];
char *env = getenv("PATH");
@@ -128,9 +128,8 @@ static const char *normalize_arch(char *arch)
return arch;
}
-static int perf_session_env__lookup_binutils_path(struct perf_session_env *env,
- const char *name,
- const char **path)
+static int perf_env__lookup_binutils_path(struct perf_env *env,
+ const char *name, const char **path)
{
int idx;
const char *arch, *cross_env;
@@ -206,7 +205,7 @@ out_error:
return -1;
}
-int perf_session_env__lookup_objdump(struct perf_session_env *env)
+int perf_env__lookup_objdump(struct perf_env *env)
{
/*
* For live mode, env->arch will be NULL and we can use
@@ -215,6 +214,5 @@ int perf_session_env__lookup_objdump(struct perf_session_env *env)
if (env->arch == NULL)
return 0;
- return perf_session_env__lookup_binutils_path(env, "objdump",
- &objdump_path);
+ return perf_env__lookup_binutils_path(env, "objdump", &objdump_path);
}