Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / blackfin / include / asm / ipipe_base.h

diff --git a/arch/blackfin/include/asm/ipipe_base.h b/arch/blackfin/include/asm/ipipe_base.h
index cb1025a..490098f 100644 (file)
--- a/arch/blackfin/include/asm/ipipe_base.h
+++ b/arch/blackfin/include/asm/ipipe_base.h
@@ -1,5 +1,5 @@
 /*   -*- linux-c -*-
- *   include/asm-blackfin/_baseipipe.h
+ *   include/asm-blackfin/ipipe_base.h
  *
  *   Copyright (C) 2007 Philippe Gerum.
  *
@@ -27,8 +27,9 @@
 #define IPIPE_NR_XIRQS         NR_IRQS
 #define IPIPE_IRQ_ISHIFT       5       /* 2^5 for 32bits arch. */
 
-/* Blackfin-specific, global domain flags */
-#define IPIPE_ROOTLOCK_FLAG    1       /* Lock pipeline for root */
+/* Blackfin-specific, per-cpu pipeline status */
+#define IPIPE_SYNCDEFER_FLAG   15
+#define IPIPE_SYNCDEFER_MASK   (1L << IPIPE_SYNCDEFER_MASK)
 
  /* Blackfin traps -- i.e. exception vector numbers */
 #define IPIPE_NR_FAULTS                52 /* We leave a gap after VEC_ILL_RES. */
@@ -48,30 +49,25 @@
 
 #ifndef __ASSEMBLY__
 
-#include <linux/bitops.h>
-
-extern int test_bit(int nr, const void *addr);
-
-
 extern unsigned long __ipipe_root_status; /* Alias to ipipe_root_cpudom_var(status) */
 
-static inline void __ipipe_stall_root(void)
-{
-       volatile unsigned long *p = &__ipipe_root_status;
-       set_bit(0, p);
-}
-
-static inline unsigned long __ipipe_test_and_stall_root(void)
-{
-       volatile unsigned long *p = &__ipipe_root_status;
-       return test_and_set_bit(0, p);
-}
-
-static inline unsigned long __ipipe_test_root(void)
-{
-       const unsigned long *p = &__ipipe_root_status;
-       return test_bit(0, p);
-}
+#define __ipipe_stall_root()                                           \
+       do {                                                            \
+               volatile unsigned long *p = &__ipipe_root_status;       \
+               set_bit(0, p);                                          \
+       } while (0)
+
+#define __ipipe_test_and_stall_root()                                  \
+       ({                                                              \
+               volatile unsigned long *p = &__ipipe_root_status;       \
+               test_and_set_bit(0, p);                                 \
+       })
+
+#define __ipipe_test_root()                                    \
+       ({                                                      \
+               const unsigned long *p = &__ipipe_root_status;  \
+               test_bit(0, p);                                 \
+       })
 
 #endif /* !__ASSEMBLY__ */