Merge tag 'Wimplicit-fallthrough-5.3-rc5' of... (41de5963) · Commits · 戴 / test

Merge tag 'Wimplicit-fallthrough-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux Pull fallthrough fixes from Gustavo A. R. Silva: "Fix sh mainline builds: - Fix fall-through warning in sh. - Fix missing break bug in sh (this is a 10-year-old bug) Currently, mainline builds for sh are broken. These patches fix that" * tag 'Wimplicit-fallthrough-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux: sh: kernel: hw_breakpoint: Fix missing break in switch statement sh: kernel: disassemble: Mark expected switch fall-throughs

arch/sh/kernel/disassemble.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -475,8 +475,6 @@ static void print_sh_insn(u32 memaddr, u16 insn)
		printk("dbr");
		break;
		case FD_REG_N:
		if (0)
		goto d_reg_n;
		case F_REG_N:
		printk("fr%d", rn);
		break;
		@@ -488,7 +486,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
		printk("xd%d", rn & ~1);
		break;
		}
		d_reg_n:
		/* else, fall through */
		case D_REG_N:
		printk("dr%d", rn);
		break;
		@@ -497,6 +495,7 @@ static void print_sh_insn(u32 memaddr, u16 insn)
		printk("xd%d", rm & ~1);
		break;
		}
		/* else, fall through */
		case D_REG_M:
		printk("dr%d", rm);
		break;

arch/sh/kernel/hw_breakpoint.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ int arch_bp_generic_fields(int sh_len, int sh_type,
		switch (sh_type) {
		case SH_BREAKPOINT_READ:
		*gen_type = HW_BREAKPOINT_R;
		break;
		case SH_BREAKPOINT_WRITE:
		*gen_type = HW_BREAKPOINT_W;
		break;

Admin message