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

Commit bf1881cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull fall-through fixes from Gustavo A. R. Silva:
 "Mark more switch cases where we are expecting to fall through, fixing
  fall-through warnings in arm, sparc64, mips, i386 and s390"

* tag 'Wimplicit-fallthrough-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  ARM: ep93xx: Mark expected switch fall-through
  scsi: fas216: Mark expected switch fall-throughs
  pcmcia: db1xxx_ss: Mark expected switch fall-throughs
  video: fbdev: omapfb_main: Mark expected switch fall-throughs
  watchdog: riowd: Mark expected switch fall-through
  s390/net: Mark expected switch fall-throughs
  crypto: ux500/crypt: Mark expected switch fall-throughs
  watchdog: wdt977: Mark expected switch fall-through
  watchdog: scx200_wdt: Mark expected switch fall-through
  watchdog: Mark expected switch fall-throughs
  ARM: signal: Mark expected switch fall-through
  mfd: omap-usb-host: Mark expected switch fall-throughs
  mfd: db8500-prcmu: Mark expected switch fall-throughs
  ARM: OMAP: dma: Mark expected switch fall-throughs
  ARM: alignment: Mark expected switch fall-throughs
  ARM: tegra: Mark expected switch fall-through
  ARM/hw_breakpoint: Mark expected switch fall-throughs
parents 451577f3 1f7585f3

arch/arm/kernel/hw_breakpoint.c

+5 −0
Original line number Diff line number Diff line
@@ -544,6 +544,7 @@ static int arch_build_bp_info(struct perf_event *bp, 
		if ((hw->ctrl.type != ARM_BREAKPOINT_EXECUTE)

			&& max_watchpoint_len >= 8)

			break;

		/* Else, fall through */

	default:

		return -EINVAL;

	}
@@ -608,10 +609,12 @@ int hw_breakpoint_arch_parse(struct perf_event *bp, 
		/* Allow halfword watchpoints and breakpoints. */

		if (hw->ctrl.len == ARM_BREAKPOINT_LEN_2)

			break;

		/* Else, fall through */

	case 3:

		/* Allow single byte watchpoint. */

		if (hw->ctrl.len == ARM_BREAKPOINT_LEN_1)

			break;

		/* Else, fall through */

	default:

		ret = -EINVAL;

		goto out;
@@ -861,6 +864,7 @@ static int hw_breakpoint_pending(unsigned long addr, unsigned int fsr, 
		break;

	case ARM_ENTRY_ASYNC_WATCHPOINT:

		WARN(1, "Asynchronous watchpoint exception taken. Debugging results may be unreliable\n");

		/* Fall through */

	case ARM_ENTRY_SYNC_WATCHPOINT:

		watchpoint_handler(addr, fsr, regs);

		break;
@@ -909,6 +913,7 @@ static bool core_has_os_save_restore(void) 
		ARM_DBG_READ(c1, c1, 4, oslsr);

		if (oslsr & ARM_OSLSR_OSLM0)

			return true;

		/* Else, fall through */

	default:

		return false;

	}

arch/arm/kernel/signal.c

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ static int do_signal(struct pt_regs *regs, int syscall) 
		switch (retval) {

		case -ERESTART_RESTARTBLOCK:

			restart -= 2;

			/* Fall through */

		case -ERESTARTNOHAND:

		case -ERESTARTSYS:

		case -ERESTARTNOINTR:

arch/arm/mach-ep93xx/crunch.c

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static int crunch_do(struct notifier_block *self, unsigned long cmd, void *t) 
		 * FALLTHROUGH: Ensure we don't try to overwrite our newly

		 * initialised state information on the first fault.

		 */

		/* Fall through */



	case THREAD_NOTIFY_EXIT:

		crunch_task_release(thread);

arch/arm/mach-tegra/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static void __init tegra_cpu_reset_handler_enable(void) 
	switch (err) {

	case -ENOSYS:

		tegra_cpu_reset_handler_set(reset_address);

		/* pass-through */

		/* fall through */

	case 0:

		is_enabled = true;

		break;

arch/arm/mm/alignment.c

+3 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ thumb2arm(u16 tinstr) 
			return subset[(L<<1) | ((tinstr & (1<<8)) >> 8)] |

			    (tinstr & 255);		/* register_list */

		}

		/* Else fall through for illegal instruction case */

		/* Else, fall through - for illegal instruction case */



	default:

		return BAD_INSTR;
@@ -751,6 +751,8 @@ do_alignment_t32_to_handler(unsigned long *pinstr, struct pt_regs *regs, 
	case 0xe8e0:

	case 0xe9e0:

		poffset->un = (tinst2 & 0xff) << 2;

		/* Fall through */



	case 0xe940:

	case 0xe9c0:

		return do_alignment_ldrdstrd;