summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2010-08-03 15:55:48 +0200
committerJesper Nilsson <jesper.nilsson@axis.com>2010-08-04 13:02:01 +0200
commit399233265c2ce805cf19a4f56f79836faad6a034 (patch)
tree601c99a113242d7e091b88680ee54b1522a162c8
parentCRIS: More ARTPEC-3 support and i2c-boardinfo. (diff)
downloadlinux-399233265c2ce805cf19a4f56f79836faad6a034.tar.xz
linux-399233265c2ce805cf19a4f56f79836faad6a034.zip
CRIS: v32: Correct auto-restart of syscalls
Register number was incorrect in syscalls that go via the restartblock (e.g, poll). Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
-rw-r--r--arch/cris/arch-v32/kernel/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/kernel/signal.c b/arch/cris/arch-v32/kernel/signal.c
index 0b7e3f143281..b3a05ae56214 100644
--- a/arch/cris/arch-v32/kernel/signal.c
+++ b/arch/cris/arch-v32/kernel/signal.c
@@ -587,7 +587,7 @@ do_signal(int canrestart, struct pt_regs *regs)
}
if (regs->r10 == -ERESTART_RESTARTBLOCK){
- regs->r10 = __NR_restart_syscall;
+ regs->r9 = __NR_restart_syscall;
regs->erp -= 2;
}
}