diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-07-17 15:47:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 16:21:30 -0700 |
| commit | f9717f3110c8d05ad65b9a91b698cc0612fd77af (patch) | |
| tree | 102fa610ecaec3b8d30359f0a4b084b32e4b90bc | |
| parent | 07f604ccfdff2afe8224aee9322080a7c4c2014c (diff) | |
| download | linux-3.10-f9717f3110c8d05ad65b9a91b698cc0612fd77af.tar.gz linux-3.10-f9717f3110c8d05ad65b9a91b698cc0612fd77af.tar.bz2 linux-3.10-f9717f3110c8d05ad65b9a91b698cc0612fd77af.zip | |
m32r: fix pull clearing RESTORE_SIGMASK into block_sigmask() fallout
Commit a610d6e672d6 ("pull clearing RESTORE_SIGMASK into
block_sigmask()") caused:
arch/m32r/kernel/signal.c: In function 'handle_signal':
arch/m32r/kernel/signal.c:289:6: warning: 'return' with a value, in function returning void [enabled by default]
Remove the return value it forgot to remove.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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 f3fb2c029cf..d0f60b97bbc 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, case -ERESTARTNOINTR: regs->r0 = regs->orig_r0; if (prev_insn(regs) < 0) - return -EFAULT; + return; } } |