commit edd63a2763bdae0daa4f0a4d4c5d61d1154352a5
author Al Viro <viro@zeniv.linux.org.uk> Fri Apr 27 13:42:45 2012 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Fri Jun 01 12:58:50 2012 -0400
tree a36c599628574280999af2d1e7bfe2a4a6969164
parent 6fd84c0831ec78d98736b76dc5e9b849f1dbfc9e

set_restore_sigmask() is never called without SIGPENDING (and never should be)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

include/linux/thread_info.h

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index ed27970..ccc1899 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -8,6 +8,7 @@
 #define _LINUX_THREAD_INFO_H
 
 #include <linux/types.h>
+#include <linux/bug.h>
 
 struct timespec;
 struct compat_timespec;
@@ -125,7 +126,7 @@
 static inline void set_restore_sigmask(void)
 {
 	set_thread_flag(TIF_RESTORE_SIGMASK);
-	set_thread_flag(TIF_SIGPENDING);
+	WARN_ON(!test_thread_flag(TIF_SIGPENDING));
 }
 static inline void clear_restore_sigmask(void)
 {