From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752919AbbEJHJm (ORCPT ); Sun, 10 May 2015 03:09:42 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44851 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752841AbbEJHJg (ORCPT ); Sun, 10 May 2015 03:09:36 -0400 Date: Sun, 10 May 2015 00:09:18 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, jolsa@redhat.com, mingo@kernel.org, bp@suse.de, adrian.hunter@intel.com, eranian@google.com, tglx@linutronix.de, fweisbec@gmail.com, namhyung@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, dzickus@redhat.com Reply-To: dzickus@redhat.com, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, hpa@zytor.com, fweisbec@gmail.com, eranian@google.com, tglx@linutronix.de, adrian.hunter@intel.com, bp@suse.de, mingo@kernel.org, jolsa@redhat.com, dsahern@gmail.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move tile barrier.h stuff to tools/ arch/tile/include/asm/barrier.h Git-Commit-ID: d3bd708114a37bcb472715818ba21d61ef71e86a 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: d3bd708114a37bcb472715818ba21d61ef71e86a Gitweb: http://git.kernel.org/tip/d3bd708114a37bcb472715818ba21d61ef71e86a Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 8 May 2015 10:02:00 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:05:08 -0300 perf tools: Move tile barrier.h stuff to tools/arch/tile/include/asm/barrier.h We will need it for atomic.h, so move it from the ad-hoc tools/perf/ place to a tools/ subset of the kernel arch/ hierarchy. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-jwcs4r1lo0ld8a4ricbe0zug@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/tile/include/asm/barrier.h | 15 +++++++++++++++ tools/include/asm/barrier.h | 2 ++ tools/perf/MANIFEST | 1 + tools/perf/perf-sys.h | 3 --- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/arch/tile/include/asm/barrier.h b/tools/arch/tile/include/asm/barrier.h new file mode 100644 index 0000000..7d3692c --- /dev/null +++ b/tools/arch/tile/include/asm/barrier.h @@ -0,0 +1,15 @@ +#ifndef _TOOLS_LINUX_ASM_TILE_BARRIER_H +#define _TOOLS_LINUX_ASM_TILE_BARRIER_H +/* + * FIXME: This came from tools/perf/perf-sys.h, where it was first introduced + * in 620830b6954913647b7c7f68920cf48eddf6ad92, more work needed to make it + * more closely follow the Linux kernel arch/tile/include/asm/barrier.h file. + * Probably when we continue work on tools/ Kconfig support to have all the + * CONFIG_ needed for properly doing that. + */ + +#define mb() asm volatile ("mf" ::: "memory") +#define wmb() mb() +#define rmb() mb() + +#endif /* _TOOLS_LINUX_ASM_TILE_BARRIER_H */ diff --git a/tools/include/asm/barrier.h b/tools/include/asm/barrier.h index a00b948..c23fff3 100644 --- a/tools/include/asm/barrier.h +++ b/tools/include/asm/barrier.h @@ -12,6 +12,8 @@ #include "../../arch/sh/include/asm/barrier.h" #elif defined(__sparc__) #include "../../arch/sparc/include/asm/barrier.h" +#elif defined(__tile__) +#include "../../arch/tile/include/asm/barrier.h" #elif defined(__alpha__) #include "../../arch/alpha/include/asm/barrier.h" #elif defined(__mips__) diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index e4a7220..7ef14d4 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -9,6 +9,7 @@ tools/arch/sh/include/asm/barrier.h tools/arch/sparc/include/asm/barrier.h tools/arch/sparc/include/asm/barrier_32.h tools/arch/sparc/include/asm/barrier_64.h +tools/arch/tile/include/asm/barrier.h tools/arch/x86/include/asm/barrier.h tools/arch/xtensa/include/asm/barrier.h tools/scripts diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 876001e..e5be325 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -100,9 +100,6 @@ #endif #ifdef __tile__ -#define mb() asm volatile ("mf" ::: "memory") -#define wmb() asm volatile ("mf" ::: "memory") -#define rmb() asm volatile ("mf" ::: "memory") #define cpu_relax() asm volatile ("mfspr zero, PASS" ::: "memory") #define CPUINFO_PROC {"model name"} #endif