diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /tools/perf/perf.h | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'tools/perf/perf.h')
| -rw-r--r-- | tools/perf/perf.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 75f941bfba9e..6fb379bc1d1f 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
| @@ -65,9 +65,7 @@ | |||
| 65 | * Use the __kuser_memory_barrier helper in the CPU helper page. See | 65 | * Use the __kuser_memory_barrier helper in the CPU helper page. See |
| 66 | * arch/arm/kernel/entry-armv.S in the kernel source for details. | 66 | * arch/arm/kernel/entry-armv.S in the kernel source for details. |
| 67 | */ | 67 | */ |
| 68 | #define rmb() asm volatile("mov r0, #0xffff0fff; mov lr, pc;" \ | 68 | #define rmb() ((void(*)(void))0xffff0fa0)() |
| 69 | "sub pc, r0, #95" ::: "r0", "lr", "cc", \ | ||
| 70 | "memory") | ||
| 71 | #define cpu_relax() asm volatile("":::"memory") | 69 | #define cpu_relax() asm volatile("":::"memory") |
| 72 | #endif | 70 | #endif |
| 73 | 71 | ||