From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932361AbbEHVDK (ORCPT ); Fri, 8 May 2015 17:03:10 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:60447 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753173AbbEHU46 (ORCPT ); Fri, 8 May 2015 16:56:58 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Borislav Petkov , David Ahern , Don Zickus , Frederic Weisbecker , Jiri Olsa , Namhyung Kim , Stephane Eranian Subject: [PATCH 20/30] perf tools: Move generic barriers out of perf-sys.h Date: Fri, 8 May 2015 17:56:32 -0300 Message-Id: <1431118602-5877-21-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431118602-5877-1-git-send-email-acme@kernel.org> References: <1431118602-5877-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo 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 c23fff3b..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 -- 2.1.0