diff options
| author | Ariadne Conill <ariadne@dereferenced.org> | 2020-06-04 09:02:51 -0600 |
|---|---|---|
| committer | Ariadne Conill <ariadne@dereferenced.org> | 2020-06-04 09:03:18 -0600 |
| commit | 9cddcc87f4099966bea4bd1c71e56ebf9d343c7d (patch) | |
| tree | 3c5727b303f19ebf3f0faf05375053d78482e36e | |
| parent | effd0f51d4b4c5923d282fb1bf1696d4a593997b (diff) | |
| download | alpine_aports-9cddcc87f4099966bea4bd1c71e56ebf9d343c7d.tar.bz2 alpine_aports-9cddcc87f4099966bea4bd1c71e56ebf9d343c7d.tar.xz alpine_aports-9cddcc87f4099966bea4bd1c71e56ebf9d343c7d.zip | |
main/linux-octeon: fix compile
| -rw-r--r-- | main/linux-octeon/APKBUILD | 2 | ||||
| -rw-r--r-- | main/linux-octeon/kvm-fallthrough.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/main/linux-octeon/APKBUILD b/main/linux-octeon/APKBUILD index 58da5a126f..87a2bc11bb 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 | |||
| 21 | octeon-rd_name.patch | 21 | octeon-rd_name.patch |
| 22 | octeon-disable-devicetree-deprecation-warning.patch | 22 | octeon-disable-devicetree-deprecation-warning.patch |
| 23 | ubnt-e200-sdio-underclock.patch | 23 | ubnt-e200-sdio-underclock.patch |
| 24 | kvm-fallthrough.patch | ||
| 24 | 25 | ||
| 25 | config-octeon.mips64 | 26 | config-octeon.mips64 |
| 26 | " | 27 | " |
| @@ -213,5 +214,6 @@ sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb | |||
| 213 | 39d145b7afd3297d9572e7c37eb40b58c3b0d7f30cc361bdf6c89e6bb54a6072f79dea979f4b4fc24d06fe06c406d10949cbf79d373e1ba82514a2f1bb0a6255 octeon-rd_name.patch | 214 | 39d145b7afd3297d9572e7c37eb40b58c3b0d7f30cc361bdf6c89e6bb54a6072f79dea979f4b4fc24d06fe06c406d10949cbf79d373e1ba82514a2f1bb0a6255 octeon-rd_name.patch |
| 214 | a2c0d901188570ebba6917b727cdb4823bda5dbe29a559ed2055db21b4f5dd4990f623b94f07072bcbf69647f250afb52d1771d706bdc072e2cfb00003e257b4 octeon-disable-devicetree-deprecation-warning.patch | 215 | a2c0d901188570ebba6917b727cdb4823bda5dbe29a559ed2055db21b4f5dd4990f623b94f07072bcbf69647f250afb52d1771d706bdc072e2cfb00003e257b4 octeon-disable-devicetree-deprecation-warning.patch |
| 215 | c227cd4a0c9712a75d62211becb8591fccd15a93ae4483835f1ec69aabca51aaf8254c37e6315bbd5a08b1f521b369269bfe973700eb993ec6a629b7167e75f7 ubnt-e200-sdio-underclock.patch | 216 | c227cd4a0c9712a75d62211becb8591fccd15a93ae4483835f1ec69aabca51aaf8254c37e6315bbd5a08b1f521b369269bfe973700eb993ec6a629b7167e75f7 ubnt-e200-sdio-underclock.patch |
| 217 | 7dde2a2d5c7bfd06a2482da2cc9477d106fbeaf563d696cf32c2455fd9dff0c1efb69b1ddab7ef030fd2e3cb9f0774b0355d739d1ae848697e08121e617aaa9e kvm-fallthrough.patch | ||
| 216 | ab2d324503bce2926343c8a834a7f3f4a6bee460a9918d1e83c709cc0a46b56fa15952e1e81d9967eb3b268d52ca30469e0c6f31f6bf065a438bd412c5a9cd4d config-octeon.mips64 | 218 | ab2d324503bce2926343c8a834a7f3f4a6bee460a9918d1e83c709cc0a46b56fa15952e1e81d9967eb3b268d52ca30469e0c6f31f6bf065a438bd412c5a9cd4d config-octeon.mips64 |
| 217 | 1179f0c61d99ab136cc81bfed153e18a88cf4438f6be524b54d5f4ea76030e059c65e52d532cafe4eb7b1671c04583f6bf8f9114a3da969cd102a78a3530fd3f patch-5.4.44.xz" | 219 | 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 0000000000..6479f5f161 --- /dev/null +++ b/main/linux-octeon/kvm-fallthrough.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | diff -urN linux-5.4.orig/arch/mips/kvm/emulate.c linux-5.4/arch/mips/kvm/emulate.c | ||
| 2 | --- linux-5.4.orig/arch/mips/kvm/emulate.c 2020-06-04 09:01:01.953454087 -0600 | ||
| 3 | +++ linux-5.4/arch/mips/kvm/emulate.c 2020-06-04 09:01:50.763579884 -0600 | ||
| 4 | @@ -1716,7 +1716,8 @@ | ||
| 5 | |||
| 6 | case lwu_op: | ||
| 7 | vcpu->mmio_needed = 1; /* unsigned */ | ||
| 8 | - /* fall through */ | ||
| 9 | + run->mmio.len = 4; | ||
| 10 | + break; | ||
| 11 | #endif | ||
| 12 | case lw_op: | ||
| 13 | run->mmio.len = 4; | ||