From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752964AbbEJHJx (ORCPT ); Sun, 10 May 2015 03:09:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44874 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752929AbbEJHJt (ORCPT ); Sun, 10 May 2015 03:09:49 -0400 Date: Sun, 10 May 2015 00:09:35 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, eranian@google.com, acme@redhat.com, dsahern@gmail.com, dzickus@redhat.com, tglx@linutronix.de, jolsa@redhat.com, namhyung@kernel.org, bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org, fweisbec@gmail.com, adrian.hunter@intel.com Reply-To: adrian.hunter@intel.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, jolsa@redhat.com, namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, dzickus@redhat.com, eranian@google.com, hpa@zytor.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move generic barriers out of perf-sys.h Git-Commit-ID: 42b09d7b0e3d57a92b938fde5fcb532e9a88e1ea 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: 42b09d7b0e3d57a92b938fde5fcb532e9a88e1ea Gitweb: http://git.kernel.org/tip/42b09d7b0e3d57a92b938fde5fcb532e9a88e1ea Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 7 May 2015 17:17:17 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:05:08 -0300 perf tools: Move generic barriers out of perf-sys.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. The parisc stuff was just using the asm-generic/barrier.h, no need to introduce a tools/arch/parisc/ tree just yet. 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-tfas9bs1gje0hfsvhqgrosd6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/include/asm/barrier.h | 2 ++ tools/perf/perf-sys.h | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/include/asm/barrier.h b/tools/include/asm/barrier.h index c23fff3..ac66ac5 100644 --- a/tools/include/asm/barrier.h +++ b/tools/include/asm/barrier.h @@ -22,4 +22,6 @@ #include "../../arch/ia64/include/asm/barrier.h" #elif defined(__xtensa__) #include "../../arch/xtensa/include/asm/barrier.h" +#else +#include #endif diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index e5be325..83a25ce 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -50,9 +50,6 @@ #endif #ifdef __hppa__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"cpu"} #endif @@ -82,16 +79,10 @@ #endif #ifdef __arc__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"Processor"} #endif #ifdef __metag__ -#define mb() asm volatile("" ::: "memory") -#define wmb() asm volatile("" ::: "memory") -#define rmb() asm volatile("" ::: "memory") #define CPUINFO_PROC {"CPU"} #endif