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 3e8acbd..490098f 100644 (file)
--- a/arch/blackfin/include/asm/ipipe_base.h
+++ b/arch/blackfin/include/asm/ipipe_base.h
@@ -51,23 +51,23 @@
 
 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);
-}
+#define __ipipe_stall_root()                                           \
+       do {                                                            \
+               volatile unsigned long *p = &__ipipe_root_status;       \
+               set_bit(0, p);                                          \
+       } while (0)
 
-static inline unsigned long __ipipe_test_and_stall_root(void)
-{
-       volatile unsigned long *p = &__ipipe_root_status;
-       return test_and_set_bit(0, p);
-}
+#define __ipipe_test_and_stall_root()                                  \
+       ({                                                              \
+               volatile unsigned long *p = &__ipipe_root_status;       \
+               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_test_root()                                    \
+       ({                                                      \
+               const unsigned long *p = &__ipipe_root_status;  \
+               test_bit(0, p);                                 \
+       })
 
 #endif /* !__ASSEMBLY__ */