Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d4a4896 authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarDavid Ahern <david.ahern@oracle.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/r/1426084580-60780-1-git-send-email-david.ahern@oracle.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a8cd1f43

tools/perf/util/probe-event.c

+6 −4
Original line number Diff line number Diff line
@@ -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,