diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /tools/perf/util/include/asm/alternative-asm.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'tools/perf/util/include/asm/alternative-asm.h')
| -rw-r--r-- | tools/perf/util/include/asm/alternative-asm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h new file mode 100644 index 000000000000..6789d788d494 --- /dev/null +++ b/tools/perf/util/include/asm/alternative-asm.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #ifndef _PERF_ASM_ALTERNATIVE_ASM_H | ||
| 2 | #define _PERF_ASM_ALTERNATIVE_ASM_H | ||
| 3 | |||
| 4 | /* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ | ||
| 5 | |||
| 6 | #define altinstruction_entry # | ||
| 7 | |||
| 8 | #endif | ||