Messages in this thread Patch in this message | | | Subject | [PATCH 6/11] - UML - handle_signal simplification | Date | Fri, 12 Nov 2004 21:00:55 -0500 | From | Jeff Dike <> |
| |
From Bodo Stroesser - Move the signal delivery code around to eliminate a couple of temporary variables.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Index: 2.6.9/arch/um/kernel/signal_kern.c =================================================================== --- 2.6.9.orig/arch/um/kernel/signal_kern.c 2004-11-12 16:22:23.000000000 -0500 +++ 2.6.9/arch/um/kernel/signal_kern.c 2004-11-12 18:05:28.000000000 -0500 @@ -42,10 +42,8 @@ struct k_sigaction *ka, siginfo_t *info, sigset_t *oldset) { - __sighandler_t handler; void (*restorer)(void); unsigned long sp; - sigset_t save; int err, error, ret; error = PT_REGS_SYSCALL_RET(¤t->thread.regs); @@ -79,11 +77,24 @@ break; } - handler = ka->sa.sa_handler; - save = *oldset; + sp = PT_REGS_SP(regs); + if((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0)) + sp = current->sas_ss_sp + current->sas_ss_size; - if (ka->sa.sa_flags & SA_ONESHOT) - ka->sa.sa_handler = SIG_DFL; + if(error != 0) PT_REGS_SET_SYSCALL_RETURN(regs, ret); + + if (ka->sa.sa_flags & SA_RESTORER) + restorer = ka->sa.sa_restorer; + else restorer = NULL; + + if(ka->sa.sa_flags & SA_SIGINFO) + err = setup_signal_stack_si(sp, signr, + (unsigned long) ka->sa.sa_handler, + restorer, regs, info, oldset); + else + err = setup_signal_stack_sc(sp, signr, + (unsigned long) ka->sa.sa_handler, + restorer, regs, oldset); if (!(ka->sa.sa_flags & SA_NODEFER)) { spin_lock_irq(¤t->sighand->siglock); @@ -94,23 +105,6 @@ spin_unlock_irq(¤t->sighand->siglock); } - sp = PT_REGS_SP(regs); - - if((ka->sa.sa_flags & SA_ONSTACK) && (sas_ss_flags(sp) == 0)) - sp = current->sas_ss_sp + current->sas_ss_size; - - if(error != 0) - PT_REGS_SET_SYSCALL_RETURN(regs, ret); - - if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; - else restorer = NULL; - - if(ka->sa.sa_flags & SA_SIGINFO) - err = setup_signal_stack_si(sp, signr, (unsigned long) handler, - restorer, regs, info, &save); - else - err = setup_signal_stack_sc(sp, signr, (unsigned long) handler, - restorer, regs, &save); if(err) force_sigsegv(signr, current); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |