Merge tag 'nios2-v5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

7de26c41 · Linus Torvalds <[email protected]> · 2020-06-12 11:55:11 -07:00

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

Commit: 7de26c41c19fc7b2e078d31fd039e1a017064b89
Parents: 52cd0d97 · 6b57fa4d

Merge commit. Changes below are compared with the first parent: 52cd0d97.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/nios2/kernel/signal.c	modified	+1	−0	View file

arch/nios2/kernel/signal.c

View file

diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c
index a42dd09..d8a087c 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: