From: Gianfranco <[email protected]> Signed-off-by: Khem Raj <[email protected]> (cherry picked from commit 09eb0ad187fb14ac1bb83a5a8d1ac4e9e9fdb305) Signed-off-by: Armin Kuster <[email protected]> --- .../vboxguestdrivers/kernel-5.10.patch | 23 +++++++++++++++++++ .../vboxguestdrivers_6.1.18.bb | 1 + 2 files changed, 24 insertions(+) create mode 100644 meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch new file mode 100644 index 0000000000..a6b0a04545 --- /dev/null +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/kernel-5.10.patch @@ -0,0 +1,23 @@ +Origin: https://www.mail-archive.com/[email protected]/msg461494.html +From 80bfab5ec8575703ef26b442a3af2d030793ebde Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Jan=20R=C4=99korajski?= <[email protected]> +Date: Thu, 24 Dec 2020 23:03:55 +0100 +Subject: [PATCH] - DECLCALLBACK generates incorrect code on ix86, remove it + +--- + kernel-5.10.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kernel-5.10.patch b/kernel-5.10.patch +index b28d6e0..729235d 100644 +--- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c ++++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +@@ -536,7 +536,7 @@ typedef const LNXAPPLYPGRANGE *PCLNXAPPLYPGRANGE; + * @param uAddr The address to apply the new protection to. + * @param pvUser The opaque user data. + */ +-static DECLCALLBACK(int) rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) ++static int rtR0MemObjLinuxApplyPageRange(pte_t *pPte, unsigned long uAddr, void *pvUser) + { + PCLNXAPPLYPGRANGE pArgs = (PCLNXAPPLYPGRANGE)pvUser; + PRTR0MEMOBJLNX pMemLnx = pArgs->pMemLnx; diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb index ea6a082f60..d620e9893f 100644 --- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb +++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.18.bb @@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://kernel-5.10.patch \ " SRC_URI[md5sum] = "c61001386eb3822ab8f06d688a82e84b" SRC_URI[sha256sum] = "108d42b9b391b7a332a33df1662cf7b0e9d9a80f3079d16288d8b9487f427d40" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#92334): https://lists.openembedded.org/g/openembedded-devel/message/92334 Mute This Topic: https://lists.openembedded.org/mt/84433514/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
