[tip:perf/core] perf probe: Fix compiles due to declarations using perf_probe_point
From: tip-bot for David Ahern
Date: Sat Mar 14 2015 - 03:05:34 EST
Commit-ID: 6d4a48968bfb5c67002f253fbaeb5acd41d7897a
Gitweb: http://git.kernel.org/tip/6d4a48968bfb5c67002f253fbaeb5acd41d7897a
Author: David Ahern <david.ahern@xxxxxxxxxx>
AuthorDate: Wed, 11 Mar 2015 10:36:20 -0400
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Thu, 12 Mar 2015 12:40:00 -0300
perf probe: Fix compiles due to declarations using perf_probe_point
perf fails to build with gcc "(GCC) 4.4.7 20120313 (Red Hat
4.4.7-4.0.9)" (a.k.a., RHEL6 / CentOS 6 / OL 6):
cc1: warnings being treated as errors
util/probe-event.c: In function âget_alternative_line_rangeâ:
util/probe-event.c:359: error: missing initializer
util/probe-event.c:359: error: (near initialization for âpp.fileâ)
util/probe-event.c:359: error: missing initializer
util/probe-event.c:359: error: (near initialization for âresult.functionâ)
Fix by bringing in initializers to declaration.
Signed-off-by: David Ahern <david.ahern@xxxxxxxxxx>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@xxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1426084580-60780-1-git-send-email-david.ahern@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/probe-event.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index e2bf620..f272a71 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -356,12 +356,14 @@ static int get_alternative_line_range(struct debuginfo *dinfo,
struct line_range *lr,
const char *target, bool user)
{
- struct perf_probe_point pp = { 0 }, result = { 0 };
+ struct perf_probe_point pp = { .function = lr->function,
+ .file = lr->file,
+ .line = lr->start };
+ struct perf_probe_point result;
int ret, len = 0;
- pp.function = lr->function;
- pp.file = lr->file;
- pp.line = lr->start;
+ memset(&result, 0, sizeof(result));
+
if (lr->end != INT_MAX)
len = lr->end - lr->start;
ret = find_alternative_probe_point(dinfo, &pp, &result,
--
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/