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

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

perf tools: Move s390 barrier.h stuff to tools/arch/s390/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: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zv4x77074resrkl4ayzf5e7d@git.kernel.org


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

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

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copied from the kernel sources:

 *

 * Copyright IBM Corp. 1999, 2009

 *

 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>

 */



#ifndef __TOOLS_LINUX_ASM_BARRIER_H

#define __TOOLS_LINUX_ASM_BARRIER_H



/*

 * Force strict CPU ordering.

 * And yes, this is required on UP too when we're talking

 * to devices.

 */



#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES

/* Fast-BCR without checkpoint synchronization */

#define __ASM_BARRIER "bcr 14,0\n"

#else

#define __ASM_BARRIER "bcr 15,0\n"

#endif



#define mb() do {  asm volatile(__ASM_BARRIER : : : "memory"); } while (0)



#define rmb()				mb()

#define wmb()				mb()



#endif /* __TOOLS_LIB_ASM_BARRIER_H */

tools/include/asm/barrier.h

+2 −0
Original line number Diff line number Diff line
@@ -2,4 +2,6 @@ 
#include "../../arch/x86/include/asm/barrier.h"

#elif defined(__powerpc__)

#include "../../arch/powerpc/include/asm/barrier.h"

#elif defined(__s390__)

#include "../../arch/s390/include/asm/barrier.h"

#endif

tools/perf/MANIFEST

+1 −0
Original line number Diff line number Diff line 
tools/perf

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

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

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

tools/scripts

tools/build

tools/perf/perf-sys.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 
#endif



#ifdef __s390__

#define mb()		asm volatile("bcr 15,0" ::: "memory")

#define wmb()		asm volatile("bcr 15,0" ::: "memory")

#define rmb()		asm volatile("bcr 15,0" ::: "memory")

#define CPUINFO_PROC	{"vendor_id"}

#endif