MIPS: Annotate fall-through in kvm/emulate.c

Commit Message

Paul Burton July 17, 2019, 7:49 p.m. UTC

kvm_compute_return_epc contains a switch statement with an intentional
fall-through from a case handling jal (jump and link) instructions to
one handling j (jump) instructions. With -Wimplicit-fallthrough this
triggers a compile error (due to -Werror being enabled for arch/mips).

This can be reproduced using malta_kvm_defconfig.

Fix this by annotating the intentional fall-through.

Signed-off-by: Paul Burton <[e-mail]>
---

 arch/mips/kvm/emulate.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Paul Burton July 18, 2019, 8:52 p.m. UTC | #1

Hello,

Paul Burton wrote:
> kvm_compute_return_epc contains a switch statement with an intentional
> fall-through from a case handling jal (jump and link) instructions to
> one handling j (jump) instructions. With -Wimplicit-fallthrough this
> triggers a compile error (due to -Werror being enabled for arch/mips).
> 
> This can be reproduced using malta_kvm_defconfig.
> 
> Fix this by annotating the intentional fall-through.
> 
> Signed-off-by: Paul Burton <[e-mail]>

Applied to mips-fixes.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email [e-mail] to report it. ]

Patch

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index e5de6bac8197..754094b40a75 100644
--- a/arch/mips/kvm/emulate.c
+++ b/arch/mips/kvm/emulate.c
@@ -140,6 +140,7 @@  static int kvm_compute_return_epc(struct kvm_vcpu *vcpu, unsigned long instpc,
 		/* These are unconditional and in j_format. */
 	case jal_op:
 		arch->gprs[31] = instpc + 8;
+		/* fall through */
 	case j_op:
 		epc += 4;
 		epc >>= 28;