[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-1f924c29b5ab2257be88a2a4075d0800573d8479@git.kernel.org>
Date: Sat, 28 Feb 2015 01:32:37 -0800
From: tip-bot for Yunlong Song <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, a.p.zijlstra@...llo.nl, acme@...hat.com,
wangnan0@...wei.com, mingo@...nel.org,
linux-kernel@...r.kernel.org, jolsa@...nel.org, paulus@...ba.org,
yunlong.song@...wei.com, tglx@...utronix.de
Subject: [tip:perf/core] perf data:
Fix sentinel setting for data_cmds array
Commit-ID: 1f924c29b5ab2257be88a2a4075d0800573d8479
Gitweb: http://git.kernel.org/tip/1f924c29b5ab2257be88a2a4075d0800573d8479
Author: Yunlong Song <yunlong.song@...wei.com>
AuthorDate: Fri, 27 Feb 2015 19:53:46 +0800
Committer: Arnaldo Carvalho de Melo <acme@...hat.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@...wei.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Wang Nan <wangnan0@...wei.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@...hat.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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists