Skip to contentSkip to conversation

arm64: module: mark expected switch fall-through

PATCH New Matteo Croce 1 participant 1 message Jul 28, 2019 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: module: mark expected switch fall-through

Mark switch cases where we are expecting to fall through, fixes the following warning:

arch/arm64/kernel/module.c: In function ‘apply_relocate_add’:
arch/arm64/kernel/module.c:316:19: warning: this statement may fall through [-Wimplicit-fallthrough=]

    overflow_check = false;
    ~~~~~~~~~~~~~~~^~~~~~~

arch/arm64/kernel/module.c:317:3: note: here
case R_AARCH64_MOVW_UABS_G0:
^~~~
arch/arm64/kernel/module.c:322:19: warning: this statement may fall through [-Wimplicit-fallthrough=]

    overflow_check = false;
    ~~~~~~~~~~~~~~~^~~~~~~

arch/arm64/kernel/module.c:323:3: note: here
case R_AARCH64_MOVW_UABS_G1:
^~~~
arch/arm64/kernel/module.c:328:19: warning: this statement may fall through [-Wimplicit-fallthrough=]

    overflow_check = false;
    ~~~~~~~~~~~~~~~^~~~~~~

arch/arm64/kernel/module.c:329:3: note: here
case R_AARCH64_MOVW_UABS_G2:
^~~~
arch/arm64/kernel/module.c:395:19: warning: this statement may fall through [-Wimplicit-fallthrough=]

    overflow_check = false;
    ~~~~~~~~~~~~~~~^~~~~~~

arch/arm64/kernel/module.c:396:3: note: here
case R_AARCH64_ADR_PREL_PG_HI21:
^~~~

---
 arch/arm64/kernel/module.c | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm64/kernel/module.c +4 -0
index 46e643e30708..ffd76b291af2 100644
@@ -314,18 +314,21 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 		/* MOVW instruction relocations. */
 		case R_AARCH64_MOVW_UABS_G0_NC:
 			overflow_check = false;
+			/* fallthrough */
 		case R_AARCH64_MOVW_UABS_G0:
 			ovf = reloc_insn_movw(RELOC_OP_ABS, loc, val, 0,
 					      AARCH64_INSN_IMM_MOVKZ);
 			break;
 		case R_AARCH64_MOVW_UABS_G1_NC:
 			overflow_check = false;
+			/* fallthrough */
 		case R_AARCH64_MOVW_UABS_G1:
 			ovf = reloc_insn_movw(RELOC_OP_ABS, loc, val, 16,
 					      AARCH64_INSN_IMM_MOVKZ);
 			break;
 		case R_AARCH64_MOVW_UABS_G2_NC:
 			overflow_check = false;
+			/* fallthrough */
 		case R_AARCH64_MOVW_UABS_G2:
 			ovf = reloc_insn_movw(RELOC_OP_ABS, loc, val, 32,
 					      AARCH64_INSN_IMM_MOVKZ);
@@ -393,6 +396,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 			break;
 		case R_AARCH64_ADR_PREL_PG_HI21_NC:
 			overflow_check = false;
+			/* fallthrough */
 		case R_AARCH64_ADR_PREL_PG_HI21:
 			ovf = reloc_insn_adrp(me, sechdrs, loc, val);
 			if (ovf && ovf != -ERANGE)
Signature · 1 line
2.21.0