Skip to content

Commit

Permalink
perf tools: Move alpha barrier.h stuff to tools/arch/alpha/include/as…
Browse files Browse the repository at this point in the history
…m/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 94cdda6 commit 0da85d1
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions tools/arch/alpha/include/asm/barrier.h
Original file line number Diff line number Diff line change
@@ -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 */
2 changes: 2 additions & 0 deletions tools/include/asm/barrier.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions tools/perf/MANIFEST
Original file line number Diff line number Diff line change
@@ -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
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 @@ -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

Expand Down

0 comments on commit 0da85d1

Please sign in to comment.