diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /arch/m32r/kernel/signal.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'arch/m32r/kernel/signal.c')
| -rw-r--r-- | arch/m32r/kernel/signal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index f3fb2c029cfc..d0f60b97bbc5 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
| @@ -286,7 +286,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka, siginfo_t *info, | |||
| 286 | case -ERESTARTNOINTR: | 286 | case -ERESTARTNOINTR: |
| 287 | regs->r0 = regs->orig_r0; | 287 | regs->r0 = regs->orig_r0; |
| 288 | if (prev_insn(regs) < 0) | 288 | if (prev_insn(regs) < 0) |
| 289 | return -EFAULT; | 289 | return; |
| 290 | } | 290 | } |
| 291 | } | 291 | } |
| 292 | 292 | ||