From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753172AbbFDOMc (ORCPT ); Thu, 4 Jun 2015 10:12:32 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46973 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753861AbbFDOM0 (ORCPT ); Thu, 4 Jun 2015 10:12:26 -0400 Date: Thu, 4 Jun 2015 07:11:44 -0700 From: tip-bot for Wang Nan Message-ID: Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, namhyung@kernel.org, mingo@kernel.org, brendan.d.gregg@gmail.com, hekuang@huawei.com, xiakaixu@huawei.com, alexei.starovoitov@gmail.com, wangnan0@huawei.com, lizefan@huawei.com, dsahern@gmail.com, acme@redhat.com, masami.hiramatsu.pt@hitachi.com, hpa@zytor.com, daniel@iogearbox.net, tglx@linutronix.de, a.p.zijlstra@chello.nl Reply-To: acme@redhat.com, dsahern@gmail.com, lizefan@huawei.com, xiakaixu@huawei.com, wangnan0@huawei.com, alexei.starovoitov@gmail.com, hekuang@huawei.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, daniel@iogearbox.net, masami.hiramatsu.pt@hitachi.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, brendan.d.gregg@gmail.com In-Reply-To: <1433144296-74992-3-git-send-email-wangnan0@huawei.com> References: <1433144296-74992-3-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Move tools/perf/util/include/linux/{list.h ,poison.h} to tools/include Git-Commit-ID: 4fc62a89dc607cee4f75f6dbb102cd6215fd0d64 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: 4fc62a89dc607cee4f75f6dbb102cd6215fd0d64 Gitweb: http://git.kernel.org/tip/4fc62a89dc607cee4f75f6dbb102cd6215fd0d64 Author: Wang Nan AuthorDate: Mon, 1 Jun 2015 07:37:48 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 2 Jun 2015 19:07:29 -0300 tools: Move tools/perf/util/include/linux/{list.h,poison.h} to tools/include This patch moves list.h from tools/perf/util/include/linux/list.h to tools/include/linux/list.h to enable other libraries use macros in it, like libbpf which will be introduced by further patches. Since list.h depend on poison.h, poison.h is also moved. Both file use relative path, so one '..' is removed for each header to make them suit for new directory. MANIFEST is also updated for 'make perf-*-src-pkg'. Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1433144296-74992-3-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/{perf/util => }/include/linux/list.h | 6 +++--- tools/{lib/lockdep/uinclude => include}/linux/poison.h | 0 tools/perf/MANIFEST | 2 ++ tools/perf/util/include/linux/poison.h | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/include/linux/list.h b/tools/include/linux/list.h similarity index 90% rename from tools/perf/util/include/linux/list.h rename to tools/include/linux/list.h index 76ddbc7..76b014c 100644 --- a/tools/perf/util/include/linux/list.h +++ b/tools/include/linux/list.h @@ -1,10 +1,10 @@ #include #include -#include "../../../../include/linux/list.h" +#include "../../../include/linux/list.h" -#ifndef PERF_LIST_H -#define PERF_LIST_H +#ifndef TOOLS_LIST_H +#define TOOLS_LIST_H /** * list_del_range - deletes range of entries from list. * @begin: first element in the range to delete from the list. diff --git a/tools/lib/lockdep/uinclude/linux/poison.h b/tools/include/linux/poison.h similarity index 100% copy from tools/lib/lockdep/uinclude/linux/poison.h copy to tools/include/linux/poison.h diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index fce4a47..a0bdd61 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -41,7 +41,9 @@ tools/include/linux/compiler.h tools/include/linux/export.h tools/include/linux/hash.h tools/include/linux/kernel.h +tools/include/linux/list.h tools/include/linux/log2.h +tools/include/linux/poison.h tools/include/linux/types.h include/asm-generic/bitops/arch_hweight.h include/asm-generic/bitops/const_hweight.h diff --git a/tools/perf/util/include/linux/poison.h b/tools/perf/util/include/linux/poison.h deleted file mode 100644 index fef6dbc..0000000 --- a/tools/perf/util/include/linux/poison.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../../../include/linux/poison.h"