diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:44:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:44:06 -0700 |
| commit | 5847098cd896c92819800e17e983bf6530035209 (patch) | |
| tree | 9ab836fd4290caca99223b9391885625e934e587 /arch/cris/arch-v10 | |
| parent | 7f5fe3ec8eab23cc28e8fb7d23b4777ad6a05734 (diff) | |
| parent | 33dc0ad78a961dfbbb2fb65fd9df3b66ba119f57 (diff) | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
Correct auto-restart of syscalls via restartblock
CRISv10: Fix return before mutex_unlock in pcf8563
Drop the CRISv32 version of pcf8563
Diffstat (limited to 'arch/cris/arch-v10')
| -rw-r--r-- | arch/cris/arch-v10/drivers/pcf8563.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/signal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c index ea69faba9b6..1391b731ad1 100644 --- a/arch/cris/arch-v10/drivers/pcf8563.c +++ b/arch/cris/arch-v10/drivers/pcf8563.c @@ -345,7 +345,7 @@ static long pcf8563_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned int ret; mutex_lock(&pcf8563_mutex); - return pcf8563_ioctl(filp, cmd, arg); + ret = pcf8563_ioctl(filp, cmd, arg); mutex_unlock(&pcf8563_mutex); return ret; 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; } } |