[PATCH] fix compilation error of perf/core

From: Dong Hao
Date: Tue Sep 25 2012 - 04:21:34 EST


From: Dong Hao <haodong@xxxxxxxxxxxxxxxxxx>

The newest branch of perf/core should have compilation error!
Error log includes:

builtin-test.c: In function âperf_evsel__test_fieldâ:
builtin-test.c:1216:6: error:
variable âretâ set but not used [-Werror=unused-but-set-variable]
builtin-test.c: In function âperf_evsel__tp_sched_testâ:
builtin-test.c:1242:6: error:
variable âretâ set but not used [-Werror=unused-but-set-variable]
cc1: all warnings being treated as errors
make: *** [builtin-test.o] Error 1
---------------------------------------------------------------------
Fix it by replacing return value from 0 to ret.
Then this branch can be compiled successfully.

Signed-off-by: Dong Hao <haodong@xxxxxxxxxxxxxxxxxx>
---
tools/perf/builtin-test.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
index 32caf13..78b47a7 100644
--- a/tools/perf/builtin-test.c
+++ b/tools/perf/builtin-test.c
@@ -1233,7 +1233,7 @@ static int perf_evsel__test_field(struct perf_evsel *evsel, const char *name,
ret = -1;
}

- return 0;
+ return ret;
}

static int perf_evsel__tp_sched_test(void)
@@ -1286,7 +1286,7 @@ static int perf_evsel__tp_sched_test(void)
if (perf_evsel__test_field(evsel, "target_cpu", 4, true))
ret = -1;

- return 0;
+ return ret;
}

static struct test {
--
1.7.2.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/