소스 검색

Fix return type of setup_frame variants

Since 2.6.13-rc1 setup_frame and its variants return int. But some bits
were missed in the conversion.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Atsushi Nemoto 19 년 전
부모
커밋
16cd395136
2개의 변경된 파일8개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 3
      arch/mips/kernel/signal.c
  2. 8 5
      arch/mips/kernel/signal32.c

+ 0 - 3
arch/mips/kernel/signal.c

@@ -384,9 +384,6 @@ give_sigsegv:
 	return 0;
 	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,
 static inline int handle_signal(unsigned long sig, siginfo_t *info,
 	struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
 	struct k_sigaction *ka, sigset_t *oldset, struct pt_regs *regs)
 {
 {

+ 8 - 5
arch/mips/kernel/signal32.c

@@ -647,8 +647,8 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
 	return (void *)((sp - frame_size) & ALMASK);
 	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;
 	struct sigframe *frame;
 	int err = 0;
 	int err = 0;
@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,
 	       current->comm, current->pid,
 	       current->comm, current->pid,
 	       frame, regs->cp0_epc, frame->sf_code);
 	       frame, regs->cp0_epc, frame->sf_code);
 #endif
 #endif
-        return;
+	return 1;
 
 
 give_sigsegv:
 give_sigsegv:
 	force_sigsegv(signr, current);
 	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;
 	struct rt_sigframe32 *frame;
 	int err = 0;
 	int err = 0;
@@ -763,10 +765,11 @@ void setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, int signr,
 	       current->comm, current->pid,
 	       current->comm, current->pid,
 	       frame, regs->cp0_epc, frame->rs_code);
 	       frame, regs->cp0_epc, frame->rs_code);
 #endif
 #endif
-	return;
+	return 1;
 
 
 give_sigsegv:
 give_sigsegv:
 	force_sigsegv(signr, current);
 	force_sigsegv(signr, current);
+	return 0;
 }
 }
 
 
 static inline int handle_signal(unsigned long sig, siginfo_t *info,
 static inline int handle_signal(unsigned long sig, siginfo_t *info,