Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a64489c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'Wimplicit-fallthrough-5.3-rc7' of... 

Merge tag 'Wimplicit-fallthrough-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull fallthrough fixes from Gustavo A. R. Silva:
 "Fix fall-through warnings on arc and nds32 for multiple
  configurations"

* tag 'Wimplicit-fallthrough-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  nds32: Mark expected switch fall-throughs
  ARC: unwind: Mark expected switch fall-through
parents 4e73079d 7c9eb2db

arch/arc/kernel/unwind.c

+1 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ static unsigned long read_pointer(const u8 **pLoc, const void *end, 
#else

		BUILD_BUG_ON(sizeof(u32) != sizeof(value));

#endif

		/* Fall through */

	case DW_EH_PE_native:

		if (end < (const void *)(ptr.pul + 1))

			return 0;

arch/nds32/kernel/signal.c

+2 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs) 
				regs->uregs[0] = -EINTR;

				break;

			}

			/* Else, fall through */

		case -ERESTARTNOINTR:

			regs->uregs[0] = regs->orig_r0;

			regs->ipc -= 4;
@@ -360,6 +361,7 @@ static void do_signal(struct pt_regs *regs) 
		switch (regs->uregs[0]) {

		case -ERESTART_RESTARTBLOCK:

			regs->uregs[15] = __NR_restart_syscall;

			/* Fall through */

		case -ERESTARTNOHAND:

		case -ERESTARTSYS:

		case -ERESTARTNOINTR:

include/math-emu/op-common.h

+5 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ do { \ 
									     \

  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):			     \

    R##_e = X##_e;							     \

	  /* Fall through */						     \

  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):			     \

  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):				     \

  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):				     \
@@ -318,6 +319,7 @@ do { \ 
									     \

  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):			     \

    R##_e = Y##_e;							     \

	  /* Fall through */						     \

  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):			     \

  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):				     \

  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):				     \
@@ -415,6 +417,7 @@ do { \ 
  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):		\

  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):		\

    R##_s = X##_s;					\

	/* Fall through */				\

							\

  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):		\

  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\
@@ -428,6 +431,7 @@ do { \ 
  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):		\

  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):		\

    R##_s = Y##_s;					\

	/* Fall through */				\

							\

  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):	\

  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\
@@ -493,6 +497,7 @@ do { \ 
							\

  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):	\

    FP_SET_EXCEPTION(FP_EX_DIVZERO);			\

	  /* Fall through */				\

  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):		\

  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):	\

    R##_c = FP_CLS_INF;					\