diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
| commit | 984a8547052711867332eeaec4141755fc040553 (patch) | |
| tree | c8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /tools/perf/util/probe-finder.c | |
| parent | 3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff) | |
| parent | b47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff) | |
| download | talos-op-linux-984a8547052711867332eeaec4141755fc040553.tar.gz talos-op-linux-984a8547052711867332eeaec4141755fc040553.zip | |
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'tools/perf/util/probe-finder.c')
| -rw-r--r-- | tools/perf/util/probe-finder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index b5bf9d5efeaf..2a76e14db732 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -578,10 +578,12 @@ static int find_variable(Dwarf_Die *sc_die, struct probe_finder *pf) /* Search child die for local variables and parameters. */ if (!die_find_variable_at(sc_die, pf->pvar->var, pf->addr, &vr_die)) { /* Search again in global variables */ - if (!die_find_variable_at(&pf->cu_die, pf->pvar->var, 0, &vr_die)) + if (!die_find_variable_at(&pf->cu_die, pf->pvar->var, + 0, &vr_die)) { pr_warning("Failed to find '%s' in this function.\n", pf->pvar->var); ret = -ENOENT; + } } if (ret >= 0) ret = convert_variable(&vr_die, pf); |
