Skip to content

Commit

Permalink
signals: change collect_signal() to return void
Browse files Browse the repository at this point in the history
With the recent changes collect_signal() always returns true.  Change it
to return void and update the single caller.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Oleg Nesterov authored and torvalds committed Jul 25, 2008
1 parent d443420 commit 100360f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ unblock_all_signals(void)
spin_unlock_irqrestore(&current->sighand->siglock, flags);
}

static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
{
struct sigqueue *q, *first = NULL;

Expand Down Expand Up @@ -372,7 +372,6 @@ static int collect_signal(int sig, struct sigpending *list, siginfo_t *info)
info->si_pid = 0;
info->si_uid = 0;
}
return 1;
}

static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
Expand All @@ -390,8 +389,7 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
}
}

if (!collect_signal(sig, pending, info))
sig = 0;
collect_signal(sig, pending, info);
}

return sig;
Expand Down

0 comments on commit 100360f

Please sign in to comment.