linux-mips
[Top] [All Lists]

[PATCH] Fix return type of setup_frame variants

To: linux-mips@linux-mips.org
Subject: [PATCH] Fix return type of setup_frame variants
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Sat, 05 Nov 2005 23:00:58 +0900 (JST)
Cc: ralf@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Since 2.6.13-rc1, setup_frame and its variants return int.  But there
are some remaining bits.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -384,9 +384,6 @@ give_sigsegv:
        return 0;
 }
 
-extern void setup_rt_frame_n32(struct k_sigaction * ka,
-       struct pt_regs *regs, int signr, sigset_t *set, siginfo_t *info);
-
 static inline int handle_signal(unsigned long sig, siginfo_t *info,
        struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
 {
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c
--- a/arch/mips/kernel/signal32.c
+++ b/arch/mips/kernel/signal32.c
@@ -647,8 +647,8 @@ static inline void *get_sigframe(struct 
        return (void *)((sp - frame_size) & ALMASK);
 }
 
-void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
-                              int signr, sigset_t *set)
+int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
+       int signr, sigset_t *set)
 {
        struct sigframe *frame;
        int err = 0;
@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction *
               current->comm, current->pid,
               frame, regs->cp0_epc, frame->sf_code);
 #endif
-        return;
+       return 1;
 
 give_sigsegv:
        force_sigsegv(signr, current);
+       return 0;
 }
 
-void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int 
signr,       sigset_t *set, siginfo_t *info)
+int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
+       int signr, sigset_t *set, siginfo_t *info)
 {
        struct rt_sigframe32 *frame;
        int err = 0;
@@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigactio
               current->comm, current->pid,
               frame, regs->cp0_epc, frame->rs_code);
 #endif
-       return;
+       return 1;
 
 give_sigsegv:
        force_sigsegv(signr, current);
+       return 0;
 }
 
 static inline int handle_signal(unsigned long sig, siginfo_t *info,

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] Fix return type of setup_frame variants, Atsushi Nemoto <=