Commit bf343dfd877ebf16cfbc31ba121606c5b6cef01f

Authored by Al Viro
1 parent a610d6e672

don't call try_to_freeze() from do_signal()

get_signal_to_deliver() will handle it itself

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 7 changed files with 0 additions and 28 deletions Side-by-side Diff

arch/blackfin/kernel/signal.c
... ... @@ -285,9 +285,6 @@
285 285  
286 286 current->thread.esp0 = (unsigned long)regs;
287 287  
288   - if (try_to_freeze())
289   - goto no_signal;
290   -
291 288 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
292 289 if (signr > 0) {
293 290 /* Whee! Actually deliver the signal. */
... ... @@ -295,7 +292,6 @@
295 292 return;
296 293 }
297 294  
298   - no_signal:
299 295 /* Did we come from a system call? */
300 296 if (regs->orig_p0 >= 0)
301 297 /* Restart the system call - no handlers present */
arch/frv/kernel/signal.c
... ... @@ -491,16 +491,12 @@
491 491 if (!user_mode(__frame))
492 492 return;
493 493  
494   - if (try_to_freeze())
495   - goto no_signal;
496   -
497 494 signr = get_signal_to_deliver(&info, &ka, __frame, NULL);
498 495 if (signr > 0) {
499 496 handle_signal(signr, &info, &ka);
500 497 return;
501 498 }
502 499  
503   -no_signal:
504 500 /* Did we come from a system call? */
505 501 if (__frame->syscallno != -1) {
506 502 /* Restart the system call - no handlers present */
arch/h8300/kernel/signal.c
... ... @@ -466,9 +466,6 @@
466 466 if ((regs->ccr & 0x10))
467 467 return;
468 468  
469   - if (try_to_freeze())
470   - goto no_signal;
471   -
472 469 current->thread.esp0 = (unsigned long) regs;
473 470  
474 471 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
... ... @@ -477,7 +474,6 @@
477 474 handle_signal(signr, &info, &ka, regs);
478 475 return;
479 476 }
480   - no_signal:
481 477 /* Did we come from a system call? */
482 478 if (regs->orig_er0 >= 0) {
483 479 /* Restart the system call - no handlers present */
arch/hexagon/kernel/signal.c
... ... @@ -205,9 +205,6 @@
205 205 if (!user_mode(regs))
206 206 return;
207 207  
208   - if (try_to_freeze())
209   - goto no_signal;
210   -
211 208 signo = get_signal_to_deliver(&info, &sigact, regs, NULL);
212 209  
213 210 if (signo > 0) {
... ... @@ -215,7 +212,6 @@
215 212 return;
216 213 }
217 214  
218   -no_signal:
219 215 /*
220 216 * If we came from a system call, handle the restart.
221 217 */
arch/m32r/kernel/signal.c
... ... @@ -320,9 +320,6 @@
320 320 if (!user_mode(regs))
321 321 return;
322 322  
323   - if (try_to_freeze())
324   - goto no_signal;
325   -
326 323 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
327 324 if (signr > 0) {
328 325 /* Re-enable any watchpoints before delivering the
... ... @@ -337,7 +334,6 @@
337 334 return;
338 335 }
339 336  
340   - no_signal:
341 337 /* Did we come from a system call? */
342 338 if (regs->syscall_nr >= 0) {
343 339 /* Restart the system call - no handlers present */
arch/unicore32/kernel/signal.c
... ... @@ -396,16 +396,12 @@
396 396 if (!user_mode(regs))
397 397 return;
398 398  
399   - if (try_to_freeze())
400   - goto no_signal;
401   -
402 399 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
403 400 if (signr > 0) {
404 401 handle_signal(signr, &ka, &info, regs, syscall);
405 402 return;
406 403 }
407 404  
408   - no_signal:
409 405 /*
410 406 * No signal to deliver to the process - restart the syscall.
411 407 */
arch/xtensa/kernel/signal.c
... ... @@ -453,9 +453,6 @@
453 453 int signr;
454 454 struct k_sigaction ka;
455 455  
456   - if (try_to_freeze())
457   - goto no_signal;
458   -
459 456 task_pt_regs(current)->icountlevel = 0;
460 457  
461 458 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
... ... @@ -506,7 +503,6 @@
506 503 return;
507 504 }
508 505  
509   -no_signal:
510 506 /* Did we come from a system call? */
511 507 if ((signed) regs->syscall >= 0) {
512 508 /* Restart the system call - no handlers present */