summaryrefslogtreecommitdiff
path: root/arch/nios2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-06-12 21:55:11 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-06-12 21:55:11 +0300
commit7de26c41c19fc7b2e078d31fd039e1a017064b89 (patch)
tree555a0d0875c11e5ca13238f291667c6c02da8852 /arch/nios2
parent52cd0d972fa6491928add05f11f97a4a59babe92 (diff)
parent6b57fa4d374bb8c005dee396c56598c14b9c01a6 (diff)
downloadlinux-7de26c41c19fc7b2e078d31fd039e1a017064b89.tar.xz
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.c1
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: