patch-2.4.4 linux/arch/cris/kernel/signal.c
Next file: linux/arch/cris/kernel/sys_cris.c
Previous file: linux/arch/cris/kernel/setup.c
Back to the patch index
Back to the overall index
- Lines: 34
- Date:
Fri Apr 6 10:42:55 2001
- Orig file:
v2.4.3/linux/arch/cris/kernel/signal.c
- Orig date:
Thu Feb 8 16:32:44 2001
diff -u --recursive --new-file v2.4.3/linux/arch/cris/kernel/signal.c linux/arch/cris/kernel/signal.c
@@ -38,9 +38,6 @@
#define RESTART_CRIS_SYS(regs) regs->r10 = regs->orig_r10; regs->irp -= 2;
-int sys_wait4(pid_t pid, unsigned long *stat_addr,
- int options, unsigned long *ru);
-
int do_signal(int canrestart, sigset_t *oldset, struct pt_regs *regs);
int copy_siginfo_to_user(siginfo_t *to, siginfo_t *from)
@@ -391,9 +388,9 @@
} else {
/* trampoline - the desired return ip is the retcode itself */
return_ip = (unsigned long)&frame->retcode;
- /* This is movu.w __NR_sigreturn, r1; break 13; */
+ /* This is movu.w __NR_sigreturn, r9; break 13; */
/* TODO: check byteorder */
- err |= __put_user(0x1c5f, (short *)(frame->retcode+0));
+ err |= __put_user(0x9c5f, (short *)(frame->retcode+0));
err |= __put_user(__NR_sigreturn, (short *)(frame->retcode+2));
err |= __put_user(0xe93d, (short *)(frame->retcode+4));
}
@@ -453,9 +450,9 @@
} else {
/* trampoline - the desired return ip is the retcode itself */
return_ip = (unsigned long)&frame->retcode;
- /* This is movu.w __NR_sigreturn, r1; break 13; */
+ /* This is movu.w __NR_sigreturn, r9; break 13; */
/* TODO: check byteorder */
- err |= __put_user(0x1c5f, (short *)(frame->retcode+0));
+ err |= __put_user(0x9c5f, (short *)(frame->retcode+0));
err |= __put_user(__NR_sigreturn, (short *)(frame->retcode+2));
err |= __put_user(0xe93d, (short *)(frame->retcode+4));
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)