Ticket #19312: fixes_for_5.6.patch
| File fixes_for_5.6.patch, 2.0 KB (added by , 5 years ago) |
|---|
-
src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
old new DECLHIDDEN(int) vboxPciOsDevMapRegion(PV 843 843 if (!rcLnx) 844 844 { 845 845 /* For now no caching, try to optimize later. */ 846 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) 847 RTR0PTR R0PtrMapping = ioremap(pci_resource_start(pPciDev, iRegion), 848 pci_resource_len(pPciDev, iRegion)); 849 #else 846 850 RTR0PTR R0PtrMapping = ioremap_nocache(pci_resource_start(pPciDev, iRegion), 847 851 pci_resource_len(pPciDev, iRegion)); 848 852 #endif 849 853 if (R0PtrMapping != NIL_RTR0PTR) 850 854 pIns->aRegionR0Mapping[iRegion] = R0PtrMapping; 851 855 else -
src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
old new DECLHIDDEN(int) rtR0MemObjNativeMapKerne 1461 1461 * MMIO / physical memory. 1462 1462 */ 1463 1463 Assert(pMemLnxToMap->Core.enmType == RTR0MEMOBJTYPE_PHYS && !pMemLnxToMap->Core.u.Phys.fAllocated); 1464 #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) 1465 pMemLnx->Core.pv = ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub); 1466 #else 1464 1467 pMemLnx->Core.pv = pMemLnxToMap->Core.u.Phys.uCachePolicy == RTMEM_CACHE_POLICY_MMIO 1465 1468 ? ioremap_nocache(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub) 1466 1469 : ioremap(pMemLnxToMap->Core.u.Phys.PhysBase + offSub, cbSub); 1470 #endif 1467 1471 if (pMemLnx->Core.pv) 1468 1472 { 1469 1473 /** @todo fix protection. */

