From 188c1fdfa2d43eb4019b7a0f510108ac1d721cd6 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Wed, 13 Dec 2006 18:39:26 +0100
Subject: [PATCH] --- yaml --- r: 44583 b: refs/heads/master c:
 02828845dda5ccf921ab2557c6ca17b6e7fc70e2 h: refs/heads/master i:   44581:
 62757e35c01d2d0dce185a81df53224091bddf5b   44579:
 17aef9bb971eefbe5d44d6f97eed07f12bb6a4f5   44575:
 00ca203221d644ae827ce6e426f0d3947ce94236 v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-arm/processor.h | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 39d1a3c9a384..5795d65669b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 386b0ce25ae16eb1d25db6a004c959e3a9003ce3
+refs/heads/master: 02828845dda5ccf921ab2557c6ca17b6e7fc70e2
diff --git a/trunk/include/asm-arm/processor.h b/trunk/include/asm-arm/processor.h
index b442e8e2a809..1bbf16182d62 100644
--- a/trunk/include/asm-arm/processor.h
+++ b/trunk/include/asm-arm/processor.h
@@ -103,14 +103,14 @@ extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);
 #if __LINUX_ARM_ARCH__ >= 5
 
 #define ARCH_HAS_PREFETCH
-#define prefetch(ptr)				\
-	({					\
-		__asm__ __volatile__(		\
-		"pld\t%0"			\
-		:				\
-		: "o" (*(char *)(ptr))		\
-		: "cc");			\
-	})
+static inline void prefetch(const void *ptr)
+{
+	__asm__ __volatile__(
+		"pld\t%0"
+		:
+		: "o" (*(char *)ptr)
+		: "cc");
+}
 
 #define ARCH_HAS_PREFETCHW
 #define prefetchw(ptr)	prefetch(ptr)