Merge branch 'linus' into x86/step

[pandora-kernel.git] / include / asm-arm / processor.h

diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index 04f4d34..bd8029e 100644 (file)
--- a/include/asm-arm/processor.h
+++ b/include/asm-arm/processor.h
@@ -20,9 +20,14 @@
 #ifdef __KERNEL__
 
 #include <asm/ptrace.h>
-#include <asm/procinfo.h>
 #include <asm/types.h>
 
+#ifdef __KERNEL__
+#define STACK_TOP      ((current->personality == PER_LINUX_32BIT) ? \
+                        TASK_SIZE : TASK_SIZE_26)
+#define STACK_TOP_MAX  TASK_SIZE
+#endif
+
 union debug_insn {
        u32     arm;
        u16     thumb;
@@ -104,14 +109,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)