diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:51:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 11:51:57 -0700 |
| commit | 81f56e5375e84689b891e0e6c5a02ec12a1f18d9 (patch) | |
| tree | a1e128a71ff24fc705428df86a858076cfe4bc13 /tools | |
| parent | 6c09931b3f987898f5c581d267ef269f5e2e9575 (diff) | |
| parent | 27aa55c5e5123fa8b8ad0156559d34d7edff58ca (diff) | |
| download | linux-3.10-81f56e5375e84689b891e0e6c5a02ec12a1f18d9.tar.gz linux-3.10-81f56e5375e84689b891e0e6c5a02ec12a1f18d9.tar.bz2 linux-3.10-81f56e5375e84689b891e0e6c5a02ec12a1f18d9.zip | |
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 support from Catalin Marinas:
"Linux support for the 64-bit ARM architecture (AArch64)
Features currently supported:
- 39-bit address space for user and kernel (each)
- 4KB and 64KB page configurations
- Compat (32-bit) user applications (ARMv7, EABI only)
- Flattened Device Tree (mandated for all AArch64 platforms)
- ARM generic timers"
* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (35 commits)
arm64: ptrace: remove obsolete ptrace request numbers from user headers
arm64: Do not set the SMP/nAMP processor bit
arm64: MAINTAINERS update
arm64: Build infrastructure
arm64: Miscellaneous header files
arm64: Generic timers support
arm64: Loadable modules
arm64: Miscellaneous library functions
arm64: Performance counters support
arm64: Add support for /proc/sys/debug/exception-trace
arm64: Debugging support
arm64: Floating point and SIMD
arm64: 32-bit (compat) applications support
arm64: User access library functions
arm64: Signal handling support
arm64: VDSO support
arm64: System calls handling
arm64: ELF definitions
arm64: SMP support
arm64: DMA mapping API
...
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/perf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 87f4ec6d1f3..a89cbbb6180 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -88,6 +88,12 @@ void get_term_dimensions(struct winsize *ws); #define CPUINFO_PROC "Processor" #endif +#ifdef __aarch64__ +#include "../../arch/arm64/include/asm/unistd.h" +#define rmb() asm volatile("dmb ld" ::: "memory") +#define cpu_relax() asm volatile("yield" ::: "memory") +#endif + #ifdef __mips__ #include "../../arch/mips/include/asm/unistd.h" #define rmb() asm volatile( \ |