sh: Remove redundant try_to_freeze() invocations.
get_signal_to_deliver() takes care of this, kill off the redundancies, as per the avr32 change. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Родитель
6330c04bb4
Коммит
abef364050
|
@ -588,9 +588,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
|
||||||
if (!user_mode(regs))
|
if (!user_mode(regs))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (try_to_freeze())
|
|
||||||
goto no_signal;
|
|
||||||
|
|
||||||
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
|
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
|
||||||
oldset = ¤t->saved_sigmask;
|
oldset = ¤t->saved_sigmask;
|
||||||
else
|
else
|
||||||
|
@ -618,7 +615,6 @@ static void do_signal(struct pt_regs *regs, unsigned int save_r0)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
no_signal:
|
|
||||||
/* Did we come from a system call? */
|
/* Did we come from a system call? */
|
||||||
if (regs->tra >= 0) {
|
if (regs->tra >= 0) {
|
||||||
/* Restart the system call - no handlers present */
|
/* Restart the system call - no handlers present */
|
||||||
|
|
|
@ -98,9 +98,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset)
|
||||||
if (!user_mode(regs))
|
if (!user_mode(regs))
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
if (try_to_freeze())
|
|
||||||
goto no_signal;
|
|
||||||
|
|
||||||
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
|
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
|
||||||
oldset = ¤t->saved_sigmask;
|
oldset = ¤t->saved_sigmask;
|
||||||
else if (!oldset)
|
else if (!oldset)
|
||||||
|
@ -125,7 +122,6 @@ static int do_signal(struct pt_regs *regs, sigset_t *oldset)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
no_signal:
|
|
||||||
/* Did we come from a system call? */
|
/* Did we come from a system call? */
|
||||||
if (regs->syscall_nr >= 0) {
|
if (regs->syscall_nr >= 0) {
|
||||||
/* Restart the system call - no handlers present */
|
/* Restart the system call - no handlers present */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче