cris: Use sigsp()

Use sigsp() instead of the open coded variant.

Signed-off-by: Richard Weinberger <richard@nod.at>

diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index 12aac1fb48df8726d307ac9e9776b004246bd5f7..9b32d338838b75935277165034a8de309412cde6 100644 (file)
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -203,15 +203,9 @@ static int setup_sigcontext(struct sigcontext __user *sc,
  * - usually on the stack. */
 
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, size_t frame_size)
 {
-       unsigned long sp = rdusp();
-
-       /* This is the X/Open sanctioned signal stack switching.  */
-       if (ka->sa.sa_flags & SA_ONSTACK) {
-               if (! on_sig_stack(sp))
-                       sp = current->sas_ss_sp + current->sas_ss_size;
-       }
+       unsigned long sp = sigsp(rdusp(), ksig);
 
        /* make sure the frame is dword-aligned */
 
@@ -235,7 +229,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
        unsigned long return_ip;
        int err = 0;
 
-       frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
+       frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
@@ -287,7 +281,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
        unsigned long return_ip;
        int err = 0;
 
-       frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
+       frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;

diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index cc7a39a74aec6afbbb1a77e3374c26f66bfbfecb..78ce3b1c9bcb05748f59b1e574e1d41b245fd25b 100644 (file)
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -189,17 +189,9 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 
 /* Figure out where to put the new signal frame - usually on the stack. */
 static inline void __user *
-get_sigframe(struct k_sigaction *ka, struct pt_regs * regs, size_t frame_size)
+get_sigframe(struct ksignal *ksig, size_t frame_size)
 {
-       unsigned long sp;
-
-       sp = rdusp();
-
-       /* This is the X/Open sanctioned signal stack switching. */
-       if (ka->sa.sa_flags & SA_ONSTACK) {
-               if (!on_sig_stack(sp))
-                       sp = current->sas_ss_sp + current->sas_ss_size;
-       }
+       unsigned long sp = sigsp(rdusp(), ksig);
 
        /* Make sure the frame is dword-aligned. */
        sp &= ~3;
@@ -222,7 +214,7 @@ setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
        struct signal_frame __user *frame;
 
        err = 0;
-       frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
+       frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;
@@ -290,7 +282,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs)
        struct rt_signal_frame __user *frame;
 
        err = 0;
-       frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
+       frame = get_sigframe(ksig, sizeof(*frame));
 
        if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                return -EFAULT;