Skip to contentSkip to conversation

perf tests bp_account: Fix build with clang-6

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

lore
Share & tools
lore
#0 lore raw
Commit-ID:  1cd618838b9703eabe4a75badf433382b12f6bef
Gitweb:     https://git.kernel.org/tip/1cd618838b9703eabe4a75badf433382b12f6bef
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Mon, 19 Mar 2018 10:51:00 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 19 Mar 2018 13:51:54 -0300

perf tests bp_account: Fix build with clang-6

To shut up this compiler warning:

    CC       /tmp/build/perf/tests/bp_account.o
    CC       /tmp/build/perf/tests/task-exit.o
    CC       /tmp/build/perf/tests/sw-clock.o
  tests/bp_account.c:106:20: error: pointer type mismatch ('int (*)(void)' and 'void *') [-Werror,-Wpointer-type-mismatch]
          void *addr = is_x ? test_function : (void *) &the_var;
                            ^ ~~~~~~~~~~~~~   ~~~~~~~~~~~~~~~~~

1 error generated.

Noticed with clang 6 on fedora rawhide.

[perfbuilder@44490f0e7241 perf]$ clang -v
clang version 6.0.0 (tags/RELEASE_600/final)
Target: x86_64-unknown-linux-gnu
Thread model: posix
InstalledDir: /usr/bin
Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/8 Found candidate GCC installation: /usr/lib/gcc/x86_64-redhat-linux/8 Selected GCC installation: /usr/bin/../lib/gcc/x86_64-redhat-linux/8 Candidate multilib: .;@m64
Candidate multilib: 32;@m32
Selected multilib: .;@m64
[perfbuilder@44490f0e7241 perf]$

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Fixes 032db28e5fa3 ("perf tests: Add breakpoint accounting/modify test")
---
 tools/perf/tests/bp_account.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/tests/bp_account.c +1 -1
index 9e88d7608951..a20cbc445426 100644
@@ -103,7 +103,7 @@ static int bp_accounting(int wp_cnt, int share)
 static int detect_cnt(bool is_x)
 {
 	struct perf_event_attr attr;
-	void *addr = is_x ? test_function : (void *) &the_var;
+	void *addr = is_x ? (void *)test_function : (void *)&the_var;
 	int fd[100], cnt = 0, i;
 
 	while (1) {