From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752747AbbEJHII (ORCPT ); Sun, 10 May 2015 03:08:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44784 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbbEJHIE (ORCPT ); Sun, 10 May 2015 03:08:04 -0400 Date: Sun, 10 May 2015 00:07:50 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, eranian@google.com, dzickus@redhat.com, dsahern@gmail.com, jolsa@redhat.com, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, fweisbec@gmail.com, tglx@linutronix.de, bp@suse.de Reply-To: linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, eranian@google.com, dzickus@redhat.com, dsahern@gmail.com, jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, fweisbec@gmail.com, bp@suse.de, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move alpha barrier.h stuff to tools/ arch/alpha/include/asm/barrier.h Git-Commit-ID: 0da85d1e38b4c186d2248f0239b72d465f5b406c 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: 0da85d1e38b4c186d2248f0239b72d465f5b406c Gitweb: http://git.kernel.org/tip/0da85d1e38b4c186d2248f0239b72d465f5b406c Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 7 May 2015 17:52:19 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:05:06 -0300 perf tools: Move alpha barrier.h stuff to tools/arch/alpha/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-vs2plxuph0ne3zcupijgjy9z@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/alpha/include/asm/barrier.h | 8 ++++++++ tools/include/asm/barrier.h | 2 ++ tools/perf/MANIFEST | 1 + tools/perf/perf-sys.h | 3 --- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/arch/alpha/include/asm/barrier.h b/tools/arch/alpha/include/asm/barrier.h new file mode 100644 index 0000000..95df19c --- /dev/null +++ b/tools/arch/alpha/include/asm/barrier.h @@ -0,0 +1,8 @@ +#ifndef __TOOLS_LINUX_ASM_ALPHA_BARRIER_H +#define __TOOLS_LINUX_ASM_ALPHA_BARRIER_H + +#define mb() __asm__ __volatile__("mb": : :"memory") +#define rmb() __asm__ __volatile__("mb": : :"memory") +#define wmb() __asm__ __volatile__("wmb": : :"memory") + +#endif /* __TOOLS_LINUX_ASM_ALPHA_BARRIER_H */ diff --git a/tools/include/asm/barrier.h b/tools/include/asm/barrier.h index 87f6309..a579a2e 100644 --- a/tools/include/asm/barrier.h +++ b/tools/include/asm/barrier.h @@ -8,4 +8,6 @@ #include "../../arch/sh/include/asm/barrier.h" #elif defined(__sparc__) #include "../../arch/sparc/include/asm/barrier.h" +#elif defined(__alpha__) +#include "../../arch/alpha/include/asm/barrier.h" #endif diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index ee69240..9919ee3 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -1,4 +1,5 @@ tools/perf +tools/arch/alpha/include/asm/barrier.h tools/arch/powerpc/include/asm/barrier.h tools/arch/s390/include/asm/barrier.h tools/arch/sh/include/asm/barrier.h diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index b3e911a..4710f057 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -61,9 +61,6 @@ #endif #ifdef __alpha__ -#define mb() asm volatile("mb" ::: "memory") -#define wmb() asm volatile("wmb" ::: "memory") -#define rmb() asm volatile("mb" ::: "memory") #define CPUINFO_PROC {"cpu model"} #endif