[VirtualBox-kmod/el9] Build for centos 9.5 and rhel 9.4

commit 8b3ae9a01670aa136f63c45da4b828704145282a Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Wed Jun 26 21:54:50 2024 +0100 Build for centos 9.5 and rhel 9.4 VirtualBox-kmod.spec | 2 +- centos9.4.patch => centos9.5.patch | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) --- diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec index 2383afb..cfeeeea 100644 --- a/VirtualBox-kmod.spec +++ b/VirtualBox-kmod.spec @@ -49,7 +49,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox # This filters out the XEN kernel, since we don't run on XEN Source1: excludekernel-filter.txt Patch1: fix_7.0.6_locking_problems.patch -Patch2: centos9.4.patch +Patch2: centos9.5.patch %global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time elfutils-libelf-devel gcc diff --git a/centos9.4.patch b/centos9.5.patch similarity index 92% rename from centos9.4.patch rename to centos9.5.patch index af2ca64..dc21fa0 100644 --- a/centos9.4.patch +++ b/centos9.5.patch @@ -6,7 +6,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V flush_dcache_page(pMemLnx->apPages[rc]); # if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -# if RTLNX_VER_MIN(6,3,0) -+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4) ++# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5) vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED); # else papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED; @@ -15,7 +15,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V LNX_MM_UP_READ(pTask->mm); -# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,3) ++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,4) RTMemFree(papVMAs); # endif @@ -24,7 +24,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V * See remap_pfn_range() in mm/memory.c */ -#if RTLNX_VER_MIN(6,3,0) -+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4) ++#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5) vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP); #elif RTLNX_VER_MIN(3,7,0) vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; @@ -36,7 +36,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c flush_dcache_page(pMemLnx->apPages[rc]); # if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -# if RTLNX_VER_MIN(6,3,0) -+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4) ++# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5) vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED); # else papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED; @@ -45,7 +45,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c LNX_MM_UP_READ(pTask->mm); -# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) -+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,3) ++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,4) RTMemFree(papVMAs); # endif @@ -54,7 +54,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c * See remap_pfn_range() in mm/memory.c */ -#if RTLNX_VER_MIN(6,3,0) -+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4) ++#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5) vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP); #elif RTLNX_VER_MIN(3,7,0) vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;