diff options
-rw-r--r-- | kernel/signal.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/kernel/signal.c b/kernel/signal.c index 27533b90c347..1d8f84c5c6ee 100644 --- a/kernel/signal.c +++ b/kernel/signal.c | |||
@@ -830,12 +830,6 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t, | |||
830 | * and sent by user using something other than kill(). | 830 | * and sent by user using something other than kill(). |
831 | */ | 831 | */ |
832 | return -EAGAIN; | 832 | return -EAGAIN; |
833 | if (info->si_code == SI_TIMER) | ||
834 | /* | ||
835 | * Set up a return to indicate that we dropped | ||
836 | * the signal. | ||
837 | */ | ||
838 | ret = info->si_sys_private; | ||
839 | } | 833 | } |
840 | 834 | ||
841 | out_set: | 835 | out_set: |
@@ -856,12 +850,6 @@ specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) | |||
856 | BUG(); | 850 | BUG(); |
857 | assert_spin_locked(&t->sighand->siglock); | 851 | assert_spin_locked(&t->sighand->siglock); |
858 | 852 | ||
859 | if (!is_si_special(info) && (info->si_code == SI_TIMER)) | ||
860 | /* | ||
861 | * Set up a return to indicate that we dropped the signal. | ||
862 | */ | ||
863 | ret = info->si_sys_private; | ||
864 | |||
865 | /* Short-circuit ignored signals. */ | 853 | /* Short-circuit ignored signals. */ |
866 | if (sig_ignored(t, sig)) | 854 | if (sig_ignored(t, sig)) |
867 | goto out; | 855 | goto out; |
@@ -1048,12 +1036,6 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p) | |||
1048 | assert_spin_locked(&p->sighand->siglock); | 1036 | assert_spin_locked(&p->sighand->siglock); |
1049 | handle_stop_signal(sig, p); | 1037 | handle_stop_signal(sig, p); |
1050 | 1038 | ||
1051 | if (!is_si_special(info) && (info->si_code == SI_TIMER)) | ||
1052 | /* | ||
1053 | * Set up a return to indicate that we dropped the signal. | ||
1054 | */ | ||
1055 | ret = info->si_sys_private; | ||
1056 | |||
1057 | /* Short-circuit ignored signals. */ | 1039 | /* Short-circuit ignored signals. */ |
1058 | if (sig_ignored(p, sig)) | 1040 | if (sig_ignored(p, sig)) |
1059 | return ret; | 1041 | return ret; |