Merge branch 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc

Pull arch signal handling cleanup from Richard Weinberger:
 "This patch series moves all remaining archs to the get_signal(),
  signal_setup_done() and sigsp() functions.

  Currently these archs use open coded variants of the said functions.
  Further, unused parameters get removed from get_signal_to_deliver(),
  tracehook_signal_handler() and signal_delivered().

  At the end of the day we save around 500 lines of code."

* 'signal-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc: (43 commits)
  powerpc: Use sigsp()
  openrisc: Use sigsp()
  mn10300: Use sigsp()
  mips: Use sigsp()
  microblaze: Use sigsp()
  metag: Use sigsp()
  m68k: Use sigsp()
  m32r: Use sigsp()
  hexagon: Use sigsp()
  frv: Use sigsp()
  cris: Use sigsp()
  c6x: Use sigsp()
  blackfin: Use sigsp()
  avr32: Use sigsp()
  arm64: Use sigsp()
  arc: Use sigsp()
  sas_ss_flags: Remove nested ternary if
  Rip out get_signal_to_deliver()
  Clean up signal_delivered()
  tracehook_signal_handler: Remove sig, info, ka and regs
  ...

1 files changed, 17 insertions, 30 deletions

diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
index 7e95e1a86510..cb3142a2d40b 100644
--- a/arch/arc/kernel/signal.c
+++ b/arch/arc/kernel/signal.c
@@ -141,17 +141,13 @@ badframe:
 /*
  * Determine which stack to use..
  */
-static inline void __user *get_sigframe(struct k_sigaction *ka,
+static inline void __user *get_sigframe(struct ksignal *ksig,
                                         struct pt_regs *regs,
                                         unsigned long framesize)
 {
-        unsigned long sp = regs->sp;
+        unsigned long sp = sigsp(regs->sp, ksig);
         void __user *frame;
 
-        /* This is the X/Open sanctioned signal stack switching */
-        if ((ka->sa.sa_flags & SA_ONSTACK) && !sas_ss_flags(sp))
-                sp = current->sas_ss_sp + current->sas_ss_size;
-
         /* No matter what happens, 'sp' must be word
          * aligned otherwise nasty things could happen
          */
@@ -179,14 +175,13 @@ static inline int map_sig(int sig)
 }
 
 static int
-setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
-               sigset_t *set, struct pt_regs *regs)
+setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
 {
         struct rt_sigframe __user *sf;
         unsigned int magic = 0;
         int err = 0;
 
-        sf = get_sigframe(ka, regs, sizeof(struct rt_sigframe));
+        sf = get_sigframe(ksig, regs, sizeof(struct rt_sigframe));
         if (!sf)
                 return 1;
 
@@ -205,8 +200,8 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
          *  #2: struct siginfo
          *  #3: struct ucontext (completely populated)
          */
-        if (unlikely(ka->sa.sa_flags & SA_SIGINFO)) {
-                err |= copy_siginfo_to_user(&sf->info, info);
+        if (unlikely(ksig->ka.sa.sa_flags & SA_SIGINFO)) {
+                err |= copy_siginfo_to_user(&sf->info, &ksig->info);
                 err |= __put_user(0, &sf->uc.uc_flags);
                 err |= __put_user(NULL, &sf->uc.uc_link);
                 err |= __save_altstack(&sf->uc.uc_stack, regs->sp);
@@ -227,16 +222,16 @@ setup_rt_frame(int signo, struct k_sigaction *ka, siginfo_t *info,
                 return err;
 
         /* #1 arg to the user Signal handler */
-        regs->r0 = map_sig(signo);
+        regs->r0 = map_sig(ksig->sig);
 
         /* setup PC of user space signal handler */
-        regs->ret = (unsigned long)ka->sa.sa_handler;
+        regs->ret = (unsigned long)ksig->ka.sa.sa_handler;
 
         /*
          * handler returns using sigreturn stub provided already by userpsace
          */
-        BUG_ON(!(ka->sa.sa_flags & SA_RESTORER));
-        regs->blink = (unsigned long)ka->sa.sa_restorer;
+        BUG_ON(!(ksig->ka.sa.sa_flags & SA_RESTORER));
+        regs->blink = (unsigned long)ksig->ka.sa.sa_restorer;
 
         /* User Stack for signal handler will be above the frame just carved */
         regs->sp = (unsigned long)sf;
@@ -298,38 +293,30 @@ static void arc_restart_syscall(struct k_sigaction *ka, struct pt_regs *regs)
  * OK, we're invoking a handler
  */
 static void
-handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info,
-              struct pt_regs *regs)
+handle_signal(struct ksignal *ksig, struct pt_regs *regs)
 {
         sigset_t *oldset = sigmask_to_save();
         int ret;
 
         /* Set up the stack frame */
-        ret = setup_rt_frame(sig, ka, info, oldset, regs);
+        ret = setup_rt_frame(ksig, oldset, regs);
 
-        if (ret)
-                force_sigsegv(sig, current);
-        else
-                signal_delivered(sig, info, ka, regs, 0);
+        signal_setup_done(ret, ksig, 0);
 }
 
 void do_signal(struct pt_regs *regs)
 {
-        struct k_sigaction ka;
-        siginfo_t info;
-        int signr;
+        struct ksignal ksig;
         int restart_scall;
 
-        signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-
         restart_scall = in_syscall(regs) && syscall_restartable(regs);
 
-        if (signr > 0) {
+        if (get_signal(&ksig)) {
                 if (restart_scall) {
-                        arc_restart_syscall(&ka, regs);
+                        arc_restart_syscall(&ksig.ka, regs);
                         syscall_wont_restart(regs);     /* No more restarts */
                 }
-                handle_signal(signr, &ka, &info, regs);
+                handle_signal(&ksig, regs);
                 return;
         }