Skip to content

Commit

Permalink
perf tools: Move tile barrier.h stuff to tools/arch/tile/include/asm/…
Browse files Browse the repository at this point in the history
…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 <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Don Zickus <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Stephane Eranian <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
acmel committed May 8, 2015
1 parent e2164f0 commit d3bd708
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
15 changes: 15 additions & 0 deletions tools/arch/tile/include/asm/barrier.h
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 2 additions & 0 deletions tools/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
1 change: 1 addition & 0 deletions tools/perf/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions tools/perf/perf-sys.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d3bd708

Please sign in to comment.