diff options
| author | Linus Torvalds | 2019-08-15 00:29:53 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-08-15 00:29:53 +0200 |
| commit | 41de59634046b19cd53a1983594a95135c656997 (patch) | |
| tree | 823d24ad76727f30558511e5805294e02c8e581e | |
| parent | Merge tag 'afs-fixes-20190814' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | sh: kernel: hw_breakpoint: Fix missing break in switch statement (diff) | |
| download | kernel-qcow2-linux-41de59634046b19cd53a1983594a95135c656997.tar.gz kernel-qcow2-linux-41de59634046b19cd53a1983594a95135c656997.tar.xz kernel-qcow2-linux-41de59634046b19cd53a1983594a95135c656997.zip | |
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
| -rw-r--r-- | arch/sh/kernel/disassemble.c | 5 | ||||
| -rw-r--r-- | arch/sh/kernel/hw_breakpoint.c | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/disassemble.c b/arch/sh/kernel/disassemble.c index defebf1a9c8a..845543780cc5 100644 --- a/arch/sh/kernel/disassemble.c +++ b/arch/sh/kernel/disassemble.c @@ -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; diff --git a/arch/sh/kernel/hw_breakpoint.c b/arch/sh/kernel/hw_breakpoint.c index 3bd010b4c55f..f10d64311127 100644 --- a/arch/sh/kernel/hw_breakpoint.c +++ b/arch/sh/kernel/hw_breakpoint.c @@ -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; |