Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2164f04 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Deng-Cheng Zhu <dengcheng.zhu@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-c5a8m8lbjuy0agep6giykxbz@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3d3337de

tools/arch/mips/include/asm/barrier.h

0 → 100644
+20 −0
Original line number Diff line number Diff line 
#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 */

tools/include/asm/barrier.h

+2 −0
Original line number Diff line number Diff line
@@ -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__)

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line
@@ -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

tools/perf/perf-sys.h

+0 −9
Original line number Diff line number Diff line
@@ -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