From 6df842f4c230fa8cf02691291b68dc11965e8057 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sat, 6 Jun 2009 21:04:17 +0200 Subject: [PATCH] --- yaml --- r: 147691 b: refs/heads/master c: 8953645fec933f992223286ad407dc371ac2caa5 h: refs/heads/master i: 147689: 85d3d62ecd9b7e0dfde32c389317b83a072880c6 147687: 1aa5ea5ef113d76442788145002710424d0cb3fb v: v3 --- [refs] | 2 +- trunk/tools/perf/util/parse-events.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c6296fe02ee1..b219ffd4dbd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d37a0cbd68c875fa984fa97bcf5c7f4b7950b6d +refs/heads/master: 8953645fec933f992223286ad407dc371ac2caa5 diff --git a/trunk/tools/perf/util/parse-events.c b/trunk/tools/perf/util/parse-events.c index e0820b4388ae..f18a9a006e1b 100644 --- a/trunk/tools/perf/util/parse-events.c +++ b/trunk/tools/perf/util/parse-events.c @@ -160,12 +160,12 @@ static int parse_aliases(const char *str, char *names[][MAX_ALIASES], int size) } } - return 0; + return -1; } static int parse_generic_hw_symbols(const char *str, struct perf_counter_attr *attr) { - __u8 cache_type = -1, cache_op = 0, cache_result = 0; + int cache_type = -1, cache_op = 0, cache_result = 0; cache_type = parse_aliases(str, hw_cache, PERF_COUNT_HW_CACHE_MAX); /* @@ -179,8 +179,8 @@ static int parse_generic_hw_symbols(const char *str, struct perf_counter_attr *a /* * Fall back to reads: */ - if (cache_type == -1) - cache_type = PERF_COUNT_HW_CACHE_OP_READ; + if (cache_op == -1) + cache_op = PERF_COUNT_HW_CACHE_OP_READ; cache_result = parse_aliases(str, hw_cache_result, PERF_COUNT_HW_CACHE_RESULT_MAX);