Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Move xtensa barrier.h stuff to tools/arch/xtensa/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-lp68dspbtjcwbpzd7x5c6zp5@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+21 -3
+18
tools/arch/xtensa/include/asm/barrier.h
··· 1 + /* 2 + * Copied from the kernel sources to tools/: 3 + * 4 + * This file is subject to the terms and conditions of the GNU General Public 5 + * License. See the file "COPYING" in the main directory of this archive 6 + * for more details. 7 + * 8 + * Copyright (C) 2001 - 2012 Tensilica Inc. 9 + */ 10 + 11 + #ifndef _TOOLS_LINUX_XTENSA_SYSTEM_H 12 + #define _TOOLS_LINUX_XTENSA_SYSTEM_H 13 + 14 + #define mb() ({ __asm__ __volatile__("memw" : : : "memory"); }) 15 + #define rmb() barrier() 16 + #define wmb() mb() 17 + 18 + #endif /* _TOOLS_LINUX_XTENSA_SYSTEM_H */
+2
tools/include/asm/barrier.h
··· 16 16 #include "../../arch/alpha/include/asm/barrier.h" 17 17 #elif defined(__ia64__) 18 18 #include "../../arch/ia64/include/asm/barrier.h" 19 + #elif defined(__xtensa__) 20 + #include "../../arch/xtensa/include/asm/barrier.h" 19 21 #endif
+1
tools/perf/MANIFEST
··· 9 9 tools/arch/sparc/include/asm/barrier_32.h 10 10 tools/arch/sparc/include/asm/barrier_64.h 11 11 tools/arch/x86/include/asm/barrier.h 12 + tools/arch/xtensa/include/asm/barrier.h 12 13 tools/scripts 13 14 tools/build 14 15 tools/lib/traceevent
-3
tools/perf/perf-sys.h
··· 105 105 #endif 106 106 107 107 #ifdef __xtensa__ 108 - #define mb() asm volatile("memw" ::: "memory") 109 - #define wmb() asm volatile("memw" ::: "memory") 110 - #define rmb() asm volatile("" ::: "memory") 111 108 #define CPUINFO_PROC {"core ID"} 112 109 #endif 113 110