aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/signal.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/signal.c')
-rw-r--r--kernel/signal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index cc8303cd093d..64ad0ed15992 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -220,7 +220,7 @@ void flush_signals(struct task_struct *t)
220 unsigned long flags; 220 unsigned long flags;
221 221
222 spin_lock_irqsave(&t->sighand->siglock, flags); 222 spin_lock_irqsave(&t->sighand->siglock, flags);
223 clear_tsk_thread_flag(t,TIF_SIGPENDING); 223 clear_tsk_thread_flag(t, TIF_SIGPENDING);
224 flush_sigqueue(&t->pending); 224 flush_sigqueue(&t->pending);
225 flush_sigqueue(&t->signal->shared_pending); 225 flush_sigqueue(&t->signal->shared_pending);
226 spin_unlock_irqrestore(&t->sighand->siglock, flags); 226 spin_unlock_irqrestore(&t->sighand->siglock, flags);
@@ -424,7 +424,7 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
424 } 424 }
425 if (signr && 425 if (signr &&
426 ((info->si_code & __SI_MASK) == __SI_TIMER) && 426 ((info->si_code & __SI_MASK) == __SI_TIMER) &&
427 info->si_sys_private){ 427 info->si_sys_private) {
428 /* 428 /*
429 * Release the siglock to ensure proper locking order 429 * Release the siglock to ensure proper locking order
430 * of timer locks outside of siglocks. Note, we leave 430 * of timer locks outside of siglocks. Note, we leave