summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-06 21:04:17 +0200
committerIngo Molnar <mingo@elte.hu>2009-06-06 21:09:08 +0200
commit8953645fec933f992223286ad407dc371ac2caa5 (patch)
treee2054022b338a4d85a3e3de7a90194b52431ff31
parentperf_counter tools: Warning fixes on 32-bit (diff)
downloadlinux-8953645fec933f992223286ad407dc371ac2caa5.tar.xz
linux-8953645fec933f992223286ad407dc371ac2caa5.zip
perf_counter tools: Fix error condition in parse_aliases()
gcc warned about this bug: util/parse-events.c: In function ‘parse_generic_hw_symbols’: util/parse-events.c:175: warning: comparison is always false due to limited range of data type util/parse-events.c:182: warning: comparison is always false due to limited range of data type util/parse-events.c:190: warning: comparison is always false due to limited range of data type Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--tools/perf/util/parse-events.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index e0820b4388ae..f18a9a006e1b 100644
--- a/tools/perf/util/parse-events.c
+++ b/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);