aboutsummaryrefslogtreecommitdiffstats
path: root/arch/c6x/kernel
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-05-23 15:28:58 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-06-01 12:58:50 -0400
commit6fd84c0831ec78d98736b76dc5e9b849f1dbfc9e (patch)
treed3d95e7a66f6edcd29cfc4f2ff01aec8422b5a88 /arch/c6x/kernel
parentbf343dfd877ebf16cfbc31ba121606c5b6cef01f (diff)
TIF_RESTORE_SIGMASK can be set only when TIF_SIGPENDING is set
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/c6x/kernel')
-rw-r--r--arch/c6x/kernel/signal.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/c6x/kernel/signal.c b/arch/c6x/kernel/signal.c
index f39346f1f2d6..d599a7fb5d24 100644
--- a/arch/c6x/kernel/signal.c
+++ b/arch/c6x/kernel/signal.c
@@ -335,8 +335,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags,
335 int syscall) 335 int syscall)
336{ 336{
337 /* deal with pending signal delivery */ 337 /* deal with pending signal delivery */
338 if (thread_info_flags & ((1 << TIF_SIGPENDING) | 338 if (thread_info_flags & (1 << TIF_SIGPENDING))
339 (1 << TIF_RESTORE_SIGMASK)))
340 do_signal(regs, syscall); 339 do_signal(regs, syscall);
341 340
342 if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) { 341 if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {