diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 18:44:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 18:44:06 -0400 |
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 ea69faba9b62..1391b731ad1c 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 | |||
345 | int ret; | 345 | int ret; |
346 | 346 | ||
347 | mutex_lock(&pcf8563_mutex); | 347 | mutex_lock(&pcf8563_mutex); |
348 | return pcf8563_ioctl(filp, cmd, arg); | 348 | ret = pcf8563_ioctl(filp, cmd, arg); |
349 | mutex_unlock(&pcf8563_mutex); | 349 | mutex_unlock(&pcf8563_mutex); |
350 | 350 | ||
351 | return ret; | 351 | return ret; |
diff --git a/arch/cris/arch-v10/kernel/signal.c b/arch/cris/arch-v10/kernel/signal.c index b6be705c2a3e..e78fe49a9849 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) | |||
537 | RESTART_CRIS_SYS(regs); | 537 | RESTART_CRIS_SYS(regs); |
538 | } | 538 | } |
539 | if (regs->r10 == -ERESTART_RESTARTBLOCK) { | 539 | if (regs->r10 == -ERESTART_RESTARTBLOCK) { |
540 | regs->r10 = __NR_restart_syscall; | 540 | regs->r9 = __NR_restart_syscall; |
541 | regs->irp -= 2; | 541 | regs->irp -= 2; |
542 | } | 542 | } |
543 | } | 543 | } |