perf bench: Use named initializers in the trailer too

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Oct 20, 2015 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2015-10-20 07:50 UTC #0 lore raw

Commit-ID:  a4c6a3e8bbb675a601f529881c51ff226f83c3f1
Gitweb:     http://git.kernel.org/tip/a4c6a3e8bbb675a601f529881c51ff226f83c3f1
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 19 Oct 2015 18:17:25 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 19 Oct 2015 18:17:25 -0300

perf bench: Use named initializers in the trailer too

To avoid this splat with gcc 4.4.7:

cc1: warnings being treated as errors
bench/mem-functions.c:273: error: missing initializer bench/mem-functions.c:273: error: (near initialization for ‘memcpy_functions[4].desc’) bench/mem-functions.c:366: error: missing initializer bench/mem-functions.c:366: error: (near initialization for ‘memset_functions[4].desc’)

Cc David Ahern <[email protected]>

Cc Hitoshi Mitake <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Linus Torvalds <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Thomas Gleixner <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/bench/mem-functions.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/perf/bench/mem-functions.c +2 -2

index d1de9c4..9419b94 100644
@@ -270,7 +270,7 @@ struct function memcpy_functions[] = {
 # undef MEMCPY_FN
 #endif
 
-	{ NULL, }
+	{ .name = NULL, }
 };
 
 static const char * const bench_mem_memcpy_usage[] = {

@@ -363,7 +363,7 @@ static const struct function memset_functions[] = {
 # undef MEMSET_FN
 #endif
 
-	{ NULL, }
+	{ .name = NULL, }
 };
 
 int bench_mem_memset(int argc, const char **argv, const char *prefix __maybe_unused)