diff --git a/[refs] b/[refs] index ac0dde693650..a329dd665bed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 021e1ae3d85a76ce962a300c96813f04ae50c87c +refs/heads/master: 53c30337f2c61aff6eecf2a446e839641172f9bd diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c index 8423867f7d8f..251cc13720bd 100644 --- a/trunk/kernel/signal.c +++ b/trunk/kernel/signal.c @@ -772,13 +772,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, */ if (legacy_queue(pending, sig)) return 0; - - /* - * Deliver the signal to listening signalfds. This must be called - * with the sighand lock held. - */ - signalfd_notify(t, sig); - /* * fast-pathed signals for kernel-internal things like SIGSTOP * or SIGKILL. @@ -828,6 +821,7 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, } out_set: + signalfd_notify(t, sig); sigaddset(&pending->signal, sig); complete_signal(sig, t, group); return 0;