Merge branch 'pxa-keypad'

[linux-2.6-omap-h63xx.git] / include / asm-arm / processor.h

diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index 04f4d34c63170736e9f6301f63a3b666c06f6303..1bbf16182d62ab4bfabd3c13e065d8280c38ccd9 100644 (file)
--- a/include/asm-arm/processor.h
+++ b/include/asm-arm/processor.h
@@ -20,7 +20,6 @@
 #ifdef __KERNEL__
 
 #include <asm/ptrace.h>
-#include <asm/procinfo.h>
 #include <asm/types.h>
 
 union debug_insn {
@@ -104,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)