From c9c8f67b8e1dce082cbcaa32b97f8bbaca99ec65 Mon Sep 17 00:00:00 2001 From: Jesper Nilsson Date: Mon, 21 Mar 2011 16:07:05 +0100 Subject: [PATCH] --- yaml --- r: 243199 b: refs/heads/master c: 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 h: refs/heads/master i: 243197: 24f9975231b897c27519b6b570bdbb212d3e8e93 243195: 11cfce6c8758c3fb0d46aee276fa0c2aad70539b 243191: b0a9a53ff2a775d679922a4efa33f495ca02df3b 243183: 5e3f72e1026e372d3aade661a45aae58cc79af2c 243167: a043ac206d6db3a02bd9b2e318d14aea29d1dbde 243135: 3134de014e97d735d12f1fc4cb0017d5868b1bef 243071: f66158cbb298407745e32a12d3dfaba967b9d819 242943: 692b4e33f6a74363a1a857aeb81eca632af82a77 242687: ad87400f1f2d361a5eca9370c4da3aa6495d5a1b v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/signal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4091f77a8e62..07165d591553 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 33874cb8cdce865938094e1a317cbfe2d7fb1ad7 +refs/heads/master: 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 diff --git a/trunk/arch/cris/arch-v10/kernel/signal.c b/trunk/arch/cris/arch-v10/kernel/signal.c index b6be705c2a3e..e78fe49a9849 100644 --- a/trunk/arch/cris/arch-v10/kernel/signal.c +++ b/trunk/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; } }