From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Tue, 3 Aug 2010 13:55:48 +0000 (+0200)
Subject: CRIS: v32: Correct auto-restart of syscalls
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=399233265c2ce805cf19a4f56f79836faad6a034;p=deliverable%2Flinux.git

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>
---

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;
 		}
 	}