Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338882
b: refs/heads/master
c: 3fded96
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Olsa authored and Ingo Molnar committed Oct 24, 2012
1 parent cfafc34 commit 9c62d48
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 20550a434583c78f8ff9a2819639e2bacbe58574
refs/heads/master: 3fded963cdae12ff891a55efc866437506c3f912
7 changes: 4 additions & 3 deletions trunk/tools/perf/util/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static int pmu_aliases(char *name, struct list_head *head)
"%s/bus/event_source/devices/%s/events", sysfs, name);

if (stat(path, &st) < 0)
return -1;
return 0; /* no error if 'events' does not exist */

if (pmu_aliases_parse(path, head))
return -1;
Expand Down Expand Up @@ -296,6 +296,9 @@ static struct perf_pmu *pmu_lookup(char *name)
if (pmu_format(name, &format))
return NULL;

if (pmu_aliases(name, &aliases))
return NULL;

if (pmu_type(name, &type))
return NULL;

Expand All @@ -305,8 +308,6 @@ static struct perf_pmu *pmu_lookup(char *name)

pmu->cpus = pmu_cpumask(name);

pmu_aliases(name, &aliases);

INIT_LIST_HEAD(&pmu->format);
INIT_LIST_HEAD(&pmu->aliases);
list_splice(&format, &pmu->format);
Expand Down

0 comments on commit 9c62d48

Please sign in to comment.