From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932696AbcCXHnL (ORCPT ); Thu, 24 Mar 2016 03:43:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43318 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932409AbcCXHnH (ORCPT ); Thu, 24 Mar 2016 03:43:07 -0400 Date: Thu, 24 Mar 2016 00:42:52 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, wangnan0@huawei.com, tglx@linutronix.de, namhyung@kernel.org, adrian.hunter@intel.com, acme@redhat.com, jolsa@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tools: Do not include stringify.h from the kernel sources Git-Commit-ID: 531d2410635ce290bee215f4bf9ec8ca98cf7302 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: 531d2410635ce290bee215f4bf9ec8ca98cf7302 Gitweb: http://git.kernel.org/tip/531d2410635ce290bee215f4bf9ec8ca98cf7302 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 23 Mar 2016 15:16:55 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 Mar 2016 15:21:15 -0300 perf tools: Do not include stringify.h from the kernel sources Use instead the copy just made to tools/include/linux/. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-q736w12nwy98x5ox2hamp5ow@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/arch/powerpc/util/header.c | 4 +--- tools/perf/builtin-report.c | 1 + tools/perf/builtin-top.c | 1 + tools/perf/util/util.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/perf/arch/powerpc/util/header.c b/tools/perf/arch/powerpc/util/header.c index 6c1b8a7..6138bde 100644 --- a/tools/perf/arch/powerpc/util/header.c +++ b/tools/perf/arch/powerpc/util/header.c @@ -3,9 +3,7 @@ #include #include #include - -#include "../../util/header.h" -#include "../../util/util.h" +#include #define mfspr(rn) ({unsigned long rval; \ asm volatile("mfspr %0," __stringify(rn) \ diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index ab47273..160ea23 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -41,6 +41,7 @@ #include #include +#include struct report { struct perf_tool tool; diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 9b0f2df..8332149 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -67,6 +67,7 @@ #include #include +#include #include static volatile int done; diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 46d4dd0..835b8ce 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -138,8 +138,6 @@ void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2))); int error(const char *err, ...) __attribute__((format (printf, 1, 2))); void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); -#include "../../../include/linux/stringify.h" - void set_warning_routine(void (*routine)(const char *err, va_list params)); int prefixcmp(const char *str, const char *prefix);