aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/kernel/process.c5
-rw-r--r--arch/mips/kernel/signal.c6
-rw-r--r--include/asm-mips/abi.h2
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 02adc7384153..5232fc752935 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -4,6 +4,7 @@
4 * for more details. 4 * for more details.
5 * 5 *
6 * Copyright (C) 1994 - 1999, 2000 by Ralf Baechle and others. 6 * Copyright (C) 1994 - 1999, 2000 by Ralf Baechle and others.
7 * Copyright (C) 2005, 2006 by Ralf Baechle (ralf@linux-mips.org)
7 * Copyright (C) 1999, 2000 Silicon Graphics, Inc. 8 * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
8 * Copyright (C) 2004 Thiemo Seufer 9 * Copyright (C) 2004 Thiemo Seufer
9 */ 10 */
@@ -58,8 +59,8 @@ ATTRIB_NORET void cpu_idle(void)
58 } 59 }
59} 60}
60 61
61extern int do_signal(struct pt_regs *regs); 62extern void do_signal(struct pt_regs *regs);
62extern int do_signal32(struct pt_regs *regs); 63extern void do_signal32(struct pt_regs *regs);
63 64
64/* 65/*
65 * Native o32 and N64 ABI without DSP ASE 66 * Native o32 and N64 ABI without DSP ASE
diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 86a14d7b8534..c974cc9b30eb 100644
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -410,7 +410,7 @@ static inline int handle_signal(unsigned long sig, siginfo_t *info,
410 return ret; 410 return ret;
411} 411}
412 412
413int do_signal(struct pt_regs *regs) 413void do_signal(struct pt_regs *regs)
414{ 414{
415 struct k_sigaction ka; 415 struct k_sigaction ka;
416 sigset_t *oldset; 416 sigset_t *oldset;
@@ -423,7 +423,7 @@ int do_signal(struct pt_regs *regs)
423 * if so. 423 * if so.
424 */ 424 */
425 if (!user_mode(regs)) 425 if (!user_mode(regs))
426 return 1; 426 return;
427 427
428 if (try_to_freeze()) 428 if (try_to_freeze())
429 goto no_signal; 429 goto no_signal;
@@ -477,8 +477,6 @@ no_signal:
477 clear_thread_flag(TIF_RESTORE_SIGMASK); 477 clear_thread_flag(TIF_RESTORE_SIGMASK);
478 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL); 478 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
479 } 479 }
480
481 return 0;
482} 480}
483 481
484/* 482/*
diff --git a/include/asm-mips/abi.h b/include/asm-mips/abi.h
index 5edd69bf0f24..1ce0518ace2e 100644
--- a/include/asm-mips/abi.h
+++ b/include/asm-mips/abi.h
@@ -13,7 +13,7 @@
13#include <asm/siginfo.h> 13#include <asm/siginfo.h>
14 14
15struct mips_abi { 15struct mips_abi {
16 int (* const do_signal)(struct pt_regs *regs); 16 void (* const do_signal)(struct pt_regs *regs);
17 int (* const setup_frame)(struct k_sigaction * ka, 17 int (* const setup_frame)(struct k_sigaction * ka,
18 struct pt_regs *regs, int signr, 18 struct pt_regs *regs, int signr,
19 sigset_t *set); 19 sigset_t *set);