From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933449AbdBPUBU (ORCPT ); Thu, 16 Feb 2017 15:01:20 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48838 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932761AbdBPUBS (ORCPT ); Thu, 16 Feb 2017 15:01:18 -0500 Date: Thu, 16 Feb 2017 12:01:01 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dbueso@suse.de, adrian.hunter@intel.com, jjelen@redhat.com, tglx@linutronix.de, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, wangnan0@huawei.com, namhyung@kernel.org, mingo@kernel.org, mitake@dcl.info.waseda.ac.jp, acme@redhat.com Reply-To: tglx@linutronix.de, jjelen@redhat.com, adrian.hunter@intel.com, dbueso@suse.de, mingo@kernel.org, acme@redhat.com, mitake@dcl.info.waseda.ac.jp, namhyung@kernel.org, jolsa@kernel.org, wangnan0@huawei.com, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf bench numa: Make sure dprintf() is not defined Git-Commit-ID: 6aa4d8264003eb4f91fb09831ad25f059113f7b2 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 6aa4d8264003eb4f91fb09831ad25f059113f7b2 Gitweb: http://git.kernel.org/tip/6aa4d8264003eb4f91fb09831ad25f059113f7b2 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 14 Feb 2017 14:19:34 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: David Ahern Cc: Davidlohr Bueso Cc: Hitoshi Mitake Cc: Jakub Jelen Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-f654o2svtrutamvxt7igwz74@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 {