Merge tag 'Wimplicit-fallthrough-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Aug 2019 16:28:25 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 29 Aug 2019 16:28:25 +0000 (09:28 -0700)
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

1  2 
arch/arc/kernel/unwind.c

diff --combined arch/arc/kernel/unwind.c
index 445e4d702f433d21c84adfc3595afb8464276dab,725adfcdd116db3f1a409f8917d806b8504b8edc..dc05a63516f5b5a3c695578cd864b2f3886910ba
@@@ -572,6 -572,7 +572,7 @@@ static unsigned long read_pointer(cons
  #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;
@@@ -826,7 -827,7 +827,7 @@@ static int processCFI(const u8 *start, 
                        case DW_CFA_def_cfa:
                                state->cfa.reg = get_uleb128(&ptr.p8, end);
                                unw_debug("cfa_def_cfa: r%lu ", state->cfa.reg);
 -                              /*nobreak*/
 +                              /* fall through */
                        case DW_CFA_def_cfa_offset:
                                state->cfa.offs = get_uleb128(&ptr.p8, end);
                                unw_debug("cfa_def_cfa_offset: 0x%lx ",
                                break;
                        case DW_CFA_def_cfa_sf:
                                state->cfa.reg = get_uleb128(&ptr.p8, end);
 -                              /*nobreak */
 +                              /* fall through */
                        case DW_CFA_def_cfa_offset_sf:
                                state->cfa.offs = get_sleb128(&ptr.p8, end)
                                    * state->dataAlign;