upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / um / kernel / signal_kern.c

diff --git a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal_kern.c
index fdebc09..7807a3e 100644 (file)
--- a/arch/um/kernel/signal_kern.c
+++ b/arch/um/kernel/signal_kern.c
@@ -74,10 +74,12 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
        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_SIGINFO)
-               err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
-       else
+#ifdef CONFIG_ARCH_HAS_SC_SIGNALS
+       if(!(ka->sa.sa_flags & SA_SIGINFO))
                err = setup_signal_stack_sc(sp, signr, ka, regs, oldset);
+       else
+#endif
+               err = setup_signal_stack_si(sp, signr, ka, regs, info, oldset);
 
        if(err){
                spin_lock_irq(&current->sighand->siglock);
@@ -194,89 +196,11 @@ long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
        }
 }
 
-int sys_sigaction(int sig, const struct old_sigaction __user *act,
-                        struct old_sigaction __user *oact)
-{
-       struct k_sigaction new_ka, old_ka;
-       int ret;
-
-       if (act) {
-               old_sigset_t mask;
-               if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
-                   __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
-                   __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
-                       return -EFAULT;
-               __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-               __get_user(mask, &act->sa_mask);
-               siginitset(&new_ka.sa.sa_mask, mask);
-       }
-
-       ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
-
-       if (!ret && oact) {
-               if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
-                   __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
-                   __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
-                       return -EFAULT;
-               __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-               __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
-       }
-
-       return ret;
-}
-
-long sys_sigaltstack(const stack_t *uss, stack_t *uoss)
+long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss)
 {
        return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
 }
 
-extern int userspace_pid[];
-
-static int copy_sc_from_user(struct pt_regs *to, void *from, 
-                            struct arch_frame_data *arch)
-{
-       int ret;
-
-       ret = CHOOSE_MODE(copy_sc_from_user_tt(UPT_SC(&to->regs), from, arch),
-                         copy_sc_from_user_skas(userspace_pid[0],
-                                                &to->regs, from));
-       return(ret);
-}
-
-long sys_sigreturn(struct pt_regs regs)
-{
-       void __user *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
-       void __user *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
-       int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
-
-       spin_lock_irq(&current->sighand->siglock);
-       copy_from_user(&current->blocked.sig[0], sc_sigmask(sc), 
-                      sizeof(current->blocked.sig[0]));
-       copy_from_user(&current->blocked.sig[1], mask, sig_size);
-       sigdelsetmask(&current->blocked, ~_BLOCKABLE);
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-       copy_sc_from_user(&current->thread.regs, sc, 
-                         &signal_frame_sc.common.arch);
-       return(PT_REGS_SYSCALL_RET(&current->thread.regs));
-}
-
-long sys_rt_sigreturn(struct pt_regs regs)
-{
-       unsigned long sp = PT_REGS_SP(&current->thread.regs);
-       struct ucontext __user *uc = sp_to_uc(sp);
-       int sig_size = _NSIG_WORDS * sizeof(unsigned long);
-
-       spin_lock_irq(&current->sighand->siglock);
-       copy_from_user(&current->blocked, &uc->uc_sigmask, sig_size);
-       sigdelsetmask(&current->blocked, ~_BLOCKABLE);
-       recalc_sigpending();
-       spin_unlock_irq(&current->sighand->siglock);
-       copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,
-                         &signal_frame_si.common.arch);
-       return(PT_REGS_SYSCALL_RET(&current->thread.regs));
-}
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically