diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 20:55:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 20:55:11 +0200 |
| commit | 7de26c41c19fc7b2e078d31fd039e1a017064b89 (patch) | |
| tree | 555a0d0875c11e5ca13238f291667c6c02da8852 /arch/nios2 | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | nios2: signal: Mark expected switch fall-through (diff) | |
| download | linux-7de26c41c19fc7b2e078d31fd039e1a017064b89.tar.xz linux-7de26c41c19fc7b2e078d31fd039e1a017064b89.zip | |
Merge tag 'nios2-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 update from Ley Foon Tan:
"Mark expected switch fall-through in signal handling"
* tag 'nios2-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: signal: Mark expected switch fall-through
Diffstat (limited to 'arch/nios2')
| -rw-r--r-- | arch/nios2/kernel/signal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c index a42dd09c6578..d8a087cf2b42 100644 --- a/arch/nios2/kernel/signal.c +++ b/arch/nios2/kernel/signal.c @@ -252,6 +252,7 @@ static int do_signal(struct pt_regs *regs) switch (retval) { case ERESTART_RESTARTBLOCK: restart = -2; + fallthrough; case ERESTARTNOHAND: case ERESTARTSYS: case ERESTARTNOINTR: |