From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752872AbbEJHJa (ORCPT ); Sun, 10 May 2015 03:09:30 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44843 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752841AbbEJHJ0 (ORCPT ); Sun, 10 May 2015 03:09:26 -0400 Date: Sun, 10 May 2015 00:09:00 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: fweisbec@gmail.com, acme@redhat.com, dsahern@gmail.com, ralf@linux-mips.org, adrian.hunter@intel.com, namhyung@kernel.org, dengcheng.zhu@gmail.com, bp@suse.de, hpa@zytor.com, tglx@linutronix.de, dzickus@redhat.com, jolsa@redhat.com, eranian@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: acme@redhat.com, fweisbec@gmail.com, dsahern@gmail.com, namhyung@kernel.org, ralf@linux-mips.org, adrian.hunter@intel.com, dengcheng.zhu@gmail.com, hpa@zytor.com, tglx@linutronix.de, bp@suse.de, jolsa@redhat.com, dzickus@redhat.com, mingo@kernel.org, eranian@google.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Move mips barrier.h stuff to tools/ arch/mips/include/asm/barrier.h Git-Commit-ID: e2164f0406db75cb1ae0bf49ae7915f0ab10e201 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: e2164f0406db75cb1ae0bf49ae7915f0ab10e201 Gitweb: http://git.kernel.org/tip/e2164f0406db75cb1ae0bf49ae7915f0ab10e201 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 8 May 2015 09:40:36 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 8 May 2015 16:05:07 -0300 perf tools: Move mips barrier.h stuff to tools/arch/mips/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: Deng-Cheng Zhu Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Ralf Baechle Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-c5a8m8lbjuy0agep6giykxbz@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/arch/mips/include/asm/barrier.h | 20 ++++++++++++++++++++ tools/include/asm/barrier.h | 2 ++ tools/perf/MANIFEST | 1 + tools/perf/perf-sys.h | 9 --------- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/tools/arch/mips/include/asm/barrier.h b/tools/arch/mips/include/asm/barrier.h new file mode 100644 index 0000000..80f96f7 --- /dev/null +++ b/tools/arch/mips/include/asm/barrier.h @@ -0,0 +1,20 @@ +#ifndef _TOOLS_LINUX_ASM_MIPS_BARRIER_H +#define _TOOLS_LINUX_ASM_MIPS_BARRIER_H +/* + * FIXME: This came from tools/perf/perf-sys.h, where it was first introduced + * in c1e028ef40b8d6943b767028ba17d4f2ba020edb, more work needed to make it + * more closely follow the Linux kernel arch/mips/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( \ + ".set mips2\n\t" \ + "sync\n\t" \ + ".set mips0" \ + : /* no output */ \ + : /* no input */ \ + : "memory") +#define wmb() mb() +#define rmb() mb() + +#endif /* _TOOLS_LINUX_ASM_MIPS_BARRIER_H */ diff --git a/tools/include/asm/barrier.h b/tools/include/asm/barrier.h index ccb2244..a00b948 100644 --- a/tools/include/asm/barrier.h +++ b/tools/include/asm/barrier.h @@ -14,6 +14,8 @@ #include "../../arch/sparc/include/asm/barrier.h" #elif defined(__alpha__) #include "../../arch/alpha/include/asm/barrier.h" +#elif defined(__mips__) +#include "../../arch/mips/include/asm/barrier.h" #elif defined(__ia64__) #include "../../arch/ia64/include/asm/barrier.h" #elif defined(__xtensa__) diff --git a/tools/perf/MANIFEST b/tools/perf/MANIFEST index 6d3c398..e4a7220 100644 --- a/tools/perf/MANIFEST +++ b/tools/perf/MANIFEST @@ -2,6 +2,7 @@ tools/perf tools/arch/alpha/include/asm/barrier.h tools/arch/arm/include/asm/barrier.h tools/arch/ia64/include/asm/barrier.h +tools/arch/mips/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 ebe228f..876001e 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -78,15 +78,6 @@ #endif #ifdef __mips__ -#define mb() asm volatile( \ - ".set mips2\n\t" \ - "sync\n\t" \ - ".set mips0" \ - : /* no output */ \ - : /* no input */ \ - : "memory") -#define wmb() mb() -#define rmb() mb() #define CPUINFO_PROC {"cpu model"} #endif