Skip to content

Commit

Permalink
Merge tag 'nios2-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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
  • Loading branch information
torvalds committed Jun 12, 2020
2 parents 52cd0d9 + 6b57fa4 commit 7de26c4
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/nios2/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7de26c4

Please sign in to comment.