diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 09:58:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 09:58:27 -0800 |
commit | f564c5fe29d3fa9adc6d839714521b0554c62598 (patch) | |
tree | d112824129cd01ee05acce915b32477718a62312 /arch/mips/kernel/signal32.c | |
parent | 423ab71a8bd2345f87724abe320092a3a516b0bb (diff) | |
parent | b887d3f2c63543dce1a0825e41be3a8d3ebef78d (diff) | |
download | kernel_samsung_tuna-f564c5fe29d3fa9adc6d839714521b0554c62598.tar.gz kernel_samsung_tuna-f564c5fe29d3fa9adc6d839714521b0554c62598.tar.bz2 kernel_samsung_tuna-f564c5fe29d3fa9adc6d839714521b0554c62598.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/kernel/signal32.c')
-rw-r--r-- | arch/mips/kernel/signal32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/signal32.c b/arch/mips/kernel/signal32.c index 136260c8f75..da3271e1fda 100644 --- a/arch/mips/kernel/signal32.c +++ b/arch/mips/kernel/signal32.c @@ -694,11 +694,11 @@ int setup_frame_32(struct k_sigaction * ka, struct pt_regs *regs, current->comm, current->pid, frame, regs->cp0_epc, frame->sf_code); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(signr, current); - return 0; + return -EFAULT; } int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, @@ -765,11 +765,11 @@ int setup_rt_frame_32(struct k_sigaction * ka, struct pt_regs *regs, current->comm, current->pid, frame, regs->cp0_epc, frame->rs_code); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(signr, current); - return 0; + return -EFAULT; } static inline int handle_signal(unsigned long sig, siginfo_t *info, |