Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 8 insertions, 8 deletions

diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index b442e8e2a809..1bbf16182d62 100644
--- a/include/asm-arm/processor.h
+++ b/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)