linux-kernel - [tip:perf/core] perf bench numa: Make sure dprintf() is not defined

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <tip-f654o2svtrutamvxt7igwz74@git.kernel.org>
Date:   Thu, 16 Feb 2017 12:01:01 -0800
From:   tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     dbueso@...e.de, adrian.hunter@...el.com, jjelen@...hat.com,
        tglx@...utronix.de, hpa@...or.com, dsahern@...il.com,
        linux-kernel@...r.kernel.org, jolsa@...nel.org,
        wangnan0@...wei.com, namhyung@...nel.org, mingo@...nel.org,
        mitake@....info.waseda.ac.jp, acme@...hat.com
Subject: [tip:perf/core] perf bench numa: Make sure dprintf() is not defined

Commit-ID:  6aa4d8264003eb4f91fb09831ad25f059113f7b2
Gitweb:     http://git.kernel.org/tip/6aa4d8264003eb4f91fb09831ad25f059113f7b2
Author:     Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Tue, 14 Feb 2017 14:19:34 -0300
Committer:  Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 14 Feb 2017 15:19:18 -0300

perf bench numa: Make sure dprintf() is not defined

When building with clang we get this error:

  bench/numa.c:46:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined]
  #define dprintf(x...) do { if (g && g->p.show_details >= 1) printf(x); } while (0)
          ^
  /usr/include/bits/stdio2.h:145:12: note: previous definition is here
  #   define dprintf(fd, ...) \
             ^
    CC       /tmp/build/perf/tests/parse-no-sample-id-all.o
  1 error generated.

So, make sure it is undefined before using that name.

Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Davidlohr Bueso <dbueso@...e.de>
Cc: Hitoshi Mitake <mitake@....info.waseda.ac.jp>
Cc: Jakub Jelen <jjelen@...hat.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: http://lkml.kernel.org/n/tip-f654o2svtrutamvxt7igwz74@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
 tools/perf/bench/numa.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c
index 9e5a02d..3083fc3 100644
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@ -43,6 +43,7 @@
 /*
  * Debug printf:
  */
+#undef dprintf
 #define dprintf(x...) do { if (g && g->p.show_details >= 1) printf(x); } while (0)
 
 struct thread_data {