From 872e77bd2c7991c059a0ff2acf02f8e9e820cc25 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Wed, 3 Mar 2010 11:47:58 +0000
Subject: [PATCH] --- yaml --- r: 187845 b: refs/heads/master c:
 da7196e1f986c846ffa8b2ec385223fad38e8518 h: refs/heads/master i:   187843:
 2e02e2eeb983a68c5f0ab184393fbfc508b4d707 v: v3

---
 [refs]                  | 2 +-
 trunk/tools/perf/perf.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 31415fa11264..3c7d2ac40e3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d
+refs/heads/master: da7196e1f986c846ffa8b2ec385223fad38e8518
diff --git a/trunk/tools/perf/perf.h b/trunk/tools/perf/perf.h
index 75f941bfba9e..6fb379bc1d1f 100644
--- a/trunk/tools/perf/perf.h
+++ b/trunk/tools/perf/perf.h
@@ -65,9 +65,7 @@
  * Use the __kuser_memory_barrier helper in the CPU helper page. See
  * arch/arm/kernel/entry-armv.S in the kernel source for details.
  */
-#define rmb()		asm volatile("mov r0, #0xffff0fff; mov lr, pc;" \
-				     "sub pc, r0, #95" ::: "r0", "lr", "cc", \
-				     "memory")
+#define rmb()		((void(*)(void))0xffff0fa0)()
 #define cpu_relax()	asm volatile("":::"memory")
 #endif