From: tip-bot for Yunlong Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, a.p.zijlstra@chello.nl, acme@redhat.com,
wangnan0@huawei.com, mingo@kernel.org,
linux-kernel@vger.kernel.org, jolsa@kernel.org, paulus@samba.org,
yunlong.song@huawei.com, tglx@linutronix.de
Subject: [tip:perf/core] perf data: Fix sentinel setting for data_cmds array
Date: Sat, 28 Feb 2015 01:32:37 -0800 [thread overview]
Message-ID: <tip-1f924c29b5ab2257be88a2a4075d0800573d8479@git.kernel.org> (raw)
In-Reply-To: <1425038026-27604-1-git-send-email-yunlong.song@huawei.com>
Commit-ID: 1f924c29b5ab2257be88a2a4075d0800573d8479
Gitweb: http://git.kernel.org/tip/1f924c29b5ab2257be88a2a4075d0800573d8479
Author: Yunlong Song <yunlong.song@huawei.com>
AuthorDate: Fri, 27 Feb 2015 19:53:46 +0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 27 Feb 2015 10:43:18 -0300
perf data: Fix sentinel setting for data_cmds array
The recent new patch "perf tools: Add new 'perf data' command" (commit
2245bf14 in acme's git repo perf/core) has caused a building error when
compiling the source code of perf:
cc1: warnings being treated as errors
builtin-data.c:89: error: missing initializer
builtin-data.c:89: error: (near initialization for ‘data_cmds[1].summary’)
make[2]: *** [builtin-data.o] Error 1
make[2]: *** Waiting for unfinished jobs....
LD bench/perf-in.o
LD tests/perf-in.o
make[1]: *** [perf-in.o] Error 2
make: *** [all] Error 2
This patch fixes the building error above.
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1425038026-27604-1-git-send-email-yunlong.song@huawei.com
[ .name == NULL ends the loop, use it instead of seting all fields to NULL ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-data.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c
index 9705ba7..155cf75 100644
--- a/tools/perf/builtin-data.c
+++ b/tools/perf/builtin-data.c
@@ -86,7 +86,7 @@ static int cmd_data_convert(int argc, const char **argv,
static struct data_cmd data_cmds[] = {
{ "convert", "converts data file between formats", cmd_data_convert },
- { NULL },
+ { .name = NULL, },
};
int cmd_data(int argc, const char **argv, const char *prefix)
prev parent reply other threads:[~2015-02-28 9:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 11:53 [PATCH] perf tools: Fix a building error introduced by recent new patch Yunlong Song
2015-02-27 13:36 ` Arnaldo Carvalho de Melo
2015-02-27 13:40 ` Arnaldo Carvalho de Melo
2015-02-28 9:32 ` tip-bot for Yunlong Song [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-1f924c29b5ab2257be88a2a4075d0800573d8479@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
--cc=yunlong.song@huawei.com \
/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: link
Be 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
Powered by JetHome