LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: tip-bot for David Ahern <tipbot@zytor.com> To: linux-tip-commits@vger.kernel.org Cc: david.ahern@oracle.com, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org Subject: [tip:perf/core] perf probe: Fix compiles due to declarations using perf_probe_point Date: Sat, 14 Mar 2015 00:05:07 -0700 [thread overview] Message-ID: <tip-6d4a48968bfb5c67002f253fbaeb5acd41d7897a@git.kernel.org> (raw) In-Reply-To: <1426084580-60780-1-git-send-email-david.ahern@oracle.com> Commit-ID: 6d4a48968bfb5c67002f253fbaeb5acd41d7897a Gitweb: http://git.kernel.org/tip/6d4a48968bfb5c67002f253fbaeb5acd41d7897a Author: David Ahern <david.ahern@oracle.com> AuthorDate: Wed, 11 Mar 2015 10:36:20 -0400 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> 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@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: Arnaldo Carvalho de Melo <acme@redhat.com> --- 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,
prev parent reply other threads:[~2015-03-14 7:05 UTC|newest] Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-11 14:36 [PATCH] perf probe: Fix compiles due to declarations using perf_probe_point David Ahern 2015-03-11 14:40 ` Arnaldo Carvalho de Melo 2015-03-14 7:05 ` tip-bot for David Ahern [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=tip-6d4a48968bfb5c67002f253fbaeb5acd41d7897a@git.kernel.org \ --to=tipbot@zytor.com \ --cc=acme@redhat.com \ --cc=david.ahern@oracle.com \ --cc=hpa@zytor.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tip-commits@vger.kernel.org \ --cc=masami.hiramatsu.pt@hitachi.com \ --cc=mingo@kernel.org \ --cc=tglx@linutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).