1 files changed, 13 insertions, 34 deletions

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index d252f45a0f9..1c4eb41dbd8 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -27,31 +27,6 @@ extern long do_no_restart_syscall(struct restart_block *parm);
  * - pass TIF_xxxx constants to these functions
  */
 
-static inline void set_thread_flag(int flag)
-{
-        set_bit(flag,&current_thread_info()->flags);
-}
-
-static inline void clear_thread_flag(int flag)
-{
-        clear_bit(flag,&current_thread_info()->flags);
-}
-
-static inline int test_and_set_thread_flag(int flag)
-{
-        return test_and_set_bit(flag,&current_thread_info()->flags);
-}
-
-static inline int test_and_clear_thread_flag(int flag)
-{
-        return test_and_clear_bit(flag,&current_thread_info()->flags);
-}
-
-static inline int test_thread_flag(int flag)
-{
-        return test_bit(flag,&current_thread_info()->flags);
-}
-
 static inline void set_ti_thread_flag(struct thread_info *ti, int flag)
 {
         set_bit(flag,&ti->flags);
@@ -77,15 +52,19 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
         return test_bit(flag,&ti->flags);
 }
 
-static inline void set_need_resched(void)
-{
-        set_thread_flag(TIF_NEED_RESCHED);
-}
-
-static inline void clear_need_resched(void)
-{
-        clear_thread_flag(TIF_NEED_RESCHED);
-}
+#define set_thread_flag(flag) \
+        set_ti_thread_flag(current_thread_info(), flag)
+#define clear_thread_flag(flag) \
+        clear_ti_thread_flag(current_thread_info(), flag)
+#define test_and_set_thread_flag(flag) \
+        test_and_set_ti_thread_flag(current_thread_info(), flag)
+#define test_and_clear_thread_flag(flag) \
+        test_and_clear_ti_thread_flag(current_thread_info(), flag)
+#define test_thread_flag(flag) \
+        test_ti_thread_flag(current_thread_info(), flag)
+
+#define set_need_resched()      set_thread_flag(TIF_NEED_RESCHED)
+#define clear_need_resched()    clear_thread_flag(TIF_NEED_RESCHED)
 
 #endif