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>

arch/x86/include/asm/thread_info.h

diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 8f3f1ff..89f794f 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -248,7 +248,7 @@
 {
 	struct thread_info *ti = current_thread_info();
 	ti->status |= TS_RESTORE_SIGMASK;
-	set_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags);
+	WARN_ON(!test_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags));
 }
 static inline void clear_restore_sigmask(void)
 {