From: toluschr <toluschr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [ISSUE] [CLOSED] virtualbox-ose-dkms: Build fails using linux5.6
Date: Thu, 02 Apr 2020 18:20:24 +0200 [thread overview]
Message-ID: <20200402162024.FwNb_UmztLySlLBzEpcRLZozBVldjaID3mvYiwoDQxQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20576@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2257 bytes --]
Closed issue by toluschr on void-packages repository
https://github.com/void-linux/void-packages/issues/20576
Description:
### System
* xuname:
Void 5.6.2_1 x86_64 AuthenticAMD notuptodate rrrmFFFFFFFFFFFFFFFFF
* package:
virtualbox-ose-dkms-6.1.4_1
### Expected behavior
Building works
### Actual behavior
Building doesn't work
### Steps to reproduce the behavior
Use kernel 5.6
It works fine with this patch: https://www.virtualbox.org/attachment/ticket/19312/fixes_for_5.6.patch
``` patch
--- src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -1461,9 +1461,13 @@ DECLHIDDEN(int) rtR0MemObjNativeMapKerne
* MMIO / physical memory.
*/
Assert(pMemLnxToMap->Core.enmType == RTR0MEMOBJTYPE_PHYS && !pMemLnxToMap->Core.u.Phys.fAllocated);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+ pMemLnx->Core.pv = ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
+#else
pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO
? ioremap_nocache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub)
: ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub);
+#endif
if (pMemLnx->Core.pv)
{
/** @todo fix protection. */
--- src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -843,9 +843,13 @@ DECLHIDDEN(int) vboxPciOsDevMapRegion(PV
if (!rcLnx)
{
/* For now no caching, try to optimize later. */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0)
+ RTR0PTR R0PtrMapping = ioremap(pci_resource_start(pPciDev, iRegion),
+ pci_resource_len(pPciDev, iRegion));
+#else
RTR0PTR R0PtrMapping = ioremap_nocache(pci_resource_start(pPciDev, iRegion),
pci_resource_len(pPciDev, iRegion));
-
+#endif
if (R0PtrMapping != NIL_RTR0PTR)
pIns->aRegionR0Mapping[iRegion] = R0PtrMapping;
else
```
next prev parent reply other threads:[~2020-04-02 16:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-02 15:31 [ISSUE] " toluschr
2020-04-02 16:20 ` toluschr [this message]
2020-04-02 16:21 ` toluschr
2020-04-02 16:27 ` xtraeme
2020-04-02 16:33 ` toluschr
2020-05-07 19:17 ` [ISSUE] [CLOSED] " toluschr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200402162024.FwNb_UmztLySlLBzEpcRLZozBVldjaID3mvYiwoDQxQ@z \
--to=toluschr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).