1 files changed, 17 insertions, 1 deletions

diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index a556ccc16b58..68831e9cf82f 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -140,7 +140,23 @@ static inline void set_restore_sigmask(void)
 {
         struct thread_info *ti = current_thread_info();
         ti->local_flags |= _TLF_RESTORE_SIGMASK;
-        set_bit(TIF_SIGPENDING, &ti->flags);
+        WARN_ON(!test_bit(TIF_SIGPENDING, &ti->flags));
+}
+static inline void clear_restore_sigmask(void)
+{
+        current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
+}
+static inline bool test_restore_sigmask(void)
+{
+        return current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK;
+}
+static inline bool test_and_clear_restore_sigmask(void)
+{
+        struct thread_info *ti = current_thread_info();
+        if (!(ti->local_flags & _TLF_RESTORE_SIGMASK))
+                return false;
+        ti->local_flags &= ~_TLF_RESTORE_SIGMASK;
+        return true;
 }
 
 static inline bool test_thread_local_flags(unsigned int flags)