diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 11:07:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-19 11:07:52 -0400 |
| commit | 7b7a57c77dccddd84b6aa02a38deee7ad97c977a (patch) | |
| tree | 10d6ca7b4d9d93c18a4b440cf4dd2714214ac959 /arch | |
| parent | 3197dac24f4f98808a47c68cdb8efeee8539add1 (diff) | |
| parent | e227e8f3ba3bfb8e26fee783026c1425ba600037 (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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sh64/kernel/signal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh64/kernel/signal.c b/arch/sh64/kernel/signal.c index c8525ade0564..0bb4a8f94276 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, | |||
| 640 | if (regs->syscall_nr >= 0) { | 640 | if (regs->syscall_nr >= 0) { |
| 641 | /* If so, check system call restarting.. */ | 641 | /* If so, check system call restarting.. */ |
| 642 | switch (regs->regs[REG_RET]) { | 642 | switch (regs->regs[REG_RET]) { |
| 643 | case -ERESTART_RESTARTBLOCK: | ||
| 643 | case -ERESTARTNOHAND: | 644 | case -ERESTARTNOHAND: |
| 644 | regs->regs[REG_RET] = -EINTR; | 645 | regs->regs[REG_RET] = -EINTR; |
| 645 | break; | 646 | break; |