aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-19 08:07:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-19 08:07:52 -0700
commit7b7a57c77dccddd84b6aa02a38deee7ad97c977a (patch)
tree10d6ca7b4d9d93c18a4b440cf4dd2714214ac959
parent3197dac24f4f98808a47c68cdb8efeee8539add1 (diff)
parente227e8f3ba3bfb8e26fee783026c1425ba600037 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6: sh64: Handle -ERESTART_RESTARTBLOCK for restartable syscalls.
-rw-r--r--arch/sh64/kernel/signal.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c
index c8525ade056..0bb4a8f9427 100644
--- a/arch/sh64/kernel/signal.c
+++ b/arch/sh64/kernel/signal.c
@@ -640,6 +640,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
if (regs->syscall_nr >= 0) {
/* If so, check system call restarting.. */
switch (regs->regs[REG_RET]) {
+ case -ERESTART_RESTARTBLOCK:
case -ERESTARTNOHAND:
regs->regs[REG_RET] = -EINTR;
break;