summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jespern@axis.com>2011-03-21 16:07:05 +0100
committerJesper Nilsson <jespern@axis.com>2011-03-21 16:07:05 +0100
commit33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 (patch)
treea054785fa04c08c2b8e41eca5119a5372a6fec4b /arch/cris
parent33874cb8cdce865938094e1a317cbfe2d7fb1ad7 (diff)
downloadlinux-3.10-33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57.tar.gz
linux-3.10-33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57.tar.bz2
linux-3.10-33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57.zip
Correct auto-restart of syscalls via restartblock
This would for example be poll(2) Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/arch-v10/kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c
index b6be705c2a3..e78fe49a984 100644
--- a/arch/cris/arch-v10/kernel/signal.c
+++ b/arch/cris/arch-v10/kernel/signal.c
@@ -537,7 +537,7 @@ void do_signal(int canrestart, struct pt_regs *regs)
RESTART_CRIS_SYS(regs);
}
if (regs->r10 == -ERESTART_RESTARTBLOCK) {
- regs->r10 = __NR_restart_syscall;
+ regs->r9 = __NR_restart_syscall;
regs->irp -= 2;
}
}