Skip to content

Commit

Permalink
[MIPS] Make do_signal return void.
Browse files Browse the repository at this point in the history
    
It's return value is ignored everywhere.
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

---
  • Loading branch information
Ralf Baechle committed Feb 8, 2006
1 parent 7b3e2fc commit 40ac5d4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 3 additions & 2 deletions arch/mips/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* for more details.
*
* Copyright (C) 1994 - 1999, 2000 by Ralf Baechle and others.
* Copyright (C) 2005, 2006 by Ralf Baechle (ralf@linux-mips.org)
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
* Copyright (C) 2004 Thiemo Seufer
*/
Expand Down Expand Up @@ -58,8 +59,8 @@ ATTRIB_NORET void cpu_idle(void)
}
}

extern int do_signal(struct pt_regs *regs);
extern int do_signal32(struct pt_regs *regs);
extern void do_signal(struct pt_regs *regs);
extern void do_signal32(struct pt_regs *regs);

/*
* Native o32 and N64 ABI without DSP ASE
Expand Down
6 changes: 2 additions & 4 deletions arch/mips/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info,
return ret;
}

int do_signal(struct pt_regs *regs)
void do_signal(struct pt_regs *regs)
{
struct k_sigaction ka;
sigset_t *oldset;
Expand All @@ -423,7 +423,7 @@ int do_signal(struct pt_regs *regs)
* if so.
*/
if (!user_mode(regs))
return 1;
return;

if (try_to_freeze())
goto no_signal;
Expand Down Expand Up @@ -477,8 +477,6 @@ int do_signal(struct pt_regs *regs)
clear_thread_flag(TIF_RESTORE_SIGMASK);
sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
}

return 0;
}

/*
Expand Down
2 changes: 1 addition & 1 deletion include/asm-mips/abi.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <asm/siginfo.h>

struct mips_abi {
int (* const do_signal)(struct pt_regs *regs);
void (* const do_signal)(struct pt_regs *regs);
int (* const setup_frame)(struct k_sigaction * ka,
struct pt_regs *regs, int signr,
sigset_t *set);
Expand Down

0 comments on commit 40ac5d4

Please sign in to comment.