From 9cddcc87f4099966bea4bd1c71e56ebf9d343c7d Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Thu, 4 Jun 2020 09:02:51 -0600
Subject: [PATCH] main/linux-octeon: fix compile
---
main/linux-octeon/APKBUILD | 2 ++
main/linux-octeon/kvm-fallthrough.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
create mode 100644 main/linux-octeon/kvm-fallthrough.patch
diff --git a/main/linux-octeon/APKBUILD b/main/linux-octeon/APKBUILD
index 58da5a126fa5..87a2bc11bbcc 100644
--- a/main/linux-octeon/APKBUILD
+++ b/main/linux-octeon/APKBUILD
@@ -21,6 +21,7 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver
octeon-rd_name.patch
octeon-disable-devicetree-deprecation-warning.patch
ubnt-e200-sdio-underclock.patch
+ kvm-fallthrough.patch
config-octeon.mips64
"
@@ -213,5 +214,6 @@ sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb
39d145b7afd3297d9572e7c37eb40b58c3b0d7f30cc361bdf6c89e6bb54a6072f79dea979f4b4fc24d06fe06c406d10949cbf79d373e1ba82514a2f1bb0a6255 octeon-rd_name.patch
a2c0d901188570ebba6917b727cdb4823bda5dbe29a559ed2055db21b4f5dd4990f623b94f07072bcbf69647f250afb52d1771d706bdc072e2cfb00003e257b4 octeon-disable-devicetree-deprecation-warning.patch
c227cd4a0c9712a75d62211becb8591fccd15a93ae4483835f1ec69aabca51aaf8254c37e6315bbd5a08b1f521b369269bfe973700eb993ec6a629b7167e75f7 ubnt-e200-sdio-underclock.patch
+7dde2a2d5c7bfd06a2482da2cc9477d106fbeaf563d696cf32c2455fd9dff0c1efb69b1ddab7ef030fd2e3cb9f0774b0355d739d1ae848697e08121e617aaa9e kvm-fallthrough.patch
ab2d324503bce2926343c8a834a7f3f4a6bee460a9918d1e83c709cc0a46b56fa15952e1e81d9967eb3b268d52ca30469e0c6f31f6bf065a438bd412c5a9cd4d config-octeon.mips64
1179f0c61d99ab136cc81bfed153e18a88cf4438f6be524b54d5f4ea76030e059c65e52d532cafe4eb7b1671c04583f6bf8f9114a3da969cd102a78a3530fd3f patch-5.4.44.xz"
diff --git a/main/linux-octeon/kvm-fallthrough.patch b/main/linux-octeon/kvm-fallthrough.patch
new file mode 100644
index 000000000000..6479f5f161af
--- /dev/null
+++ b/main/linux-octeon/kvm-fallthrough.patch
@@ -0,0 +1,13 @@
+diff -urN linux-5.4.orig/arch/mips/kvm/emulate.c linux-5.4/arch/mips/kvm/emulate.c
+--- linux-5.4.orig/arch/mips/kvm/emulate.c 2020-06-04 09:01:01.953454087 -0600
++++ linux-5.4/arch/mips/kvm/emulate.c 2020-06-04 09:01:50.763579884 -0600
+@@ -1716,7 +1716,8 @@
+
+ case lwu_op:
+ vcpu->mmio_needed = 1; /* unsigned */
+- /* fall through */
++ run->mmio.len = 4;
++ break;
+ #endif
+ case lw_op:
+ run->mmio.len = 4;
--
GitLab