aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/signal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/signal.c b/kernel/signal.c
index 50ad439377b2..fea236fe0b50 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -338,7 +338,7 @@ unblock_all_signals(void)
338 spin_unlock_irqrestore(&current->sighand->siglock, flags); 338 spin_unlock_irqrestore(&current->sighand->siglock, flags);
339} 339}
340 340
341static int collect_signal(int sig, struct sigpending *list, siginfo_t *info) 341static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
342{ 342{
343 struct sigqueue *q, *first = NULL; 343 struct sigqueue *q, *first = NULL;
344 344
@@ -372,7 +372,6 @@ still_pending:
372 info->si_pid = 0; 372 info->si_pid = 0;
373 info->si_uid = 0; 373 info->si_uid = 0;
374 } 374 }
375 return 1;
376} 375}
377 376
378static int __dequeue_signal(struct sigpending *pending, sigset_t *mask, 377static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
@@ -390,8 +389,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
390 } 389 }
391 } 390 }
392 391
393 if (!collect_signal(sig, pending, info)) 392 collect_signal(sig, pending, info);
394 sig = 0;
395 } 393 }
396 394
397 return sig; 395 return sig;