From: Paul Burton <paul.burton@mips.com>
Date: Wed, 17 Jul 2019 19:49:10 +0000 (+0000)
Subject: MIPS: Annotate fall-through in kvm/emulate.c
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5bbe54346b539b5938b65d542b6ff5e956c3c08d;p=linux.git

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

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 <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
---

diff --git a/arch/mips/kvm/emulate.c b/arch/mips/kvm/emulate.c
index e5de6bac81979..754094b40a753 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;