Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16cd3951 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle
Browse files

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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0d959c26

arch/mips/kernel/signal.c

+0 −3
Original line number Diff line number Diff line
@@ -384,9 +384,6 @@ int setup_rt_frame(struct k_sigaction * ka, struct pt_regs *regs, 
	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)

{

arch/mips/kernel/signal32.c

+8 −5
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static inline void *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, 
	return (void *)((sp - frame_size) & ALMASK);

}



void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs,

	int signr, sigset_t *set)

{

	struct sigframe *frame;
@@ -694,13 +694,15 @@ void setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, 
	       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_sigaction * ka, struct pt_regs *regs, int signr, 
	       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,