Changeset 104942 in vbox

Timestamp:

Jun 17, 2024 2:09:27 PM (8 months ago)

Author:

vboxsync

Message:

Additions: Linux: Introduce initial support for OpenSuse 15.6 kernel (additional fixes), bugref:10482.

Also remove idempotent version comparison for earlier kernel versions.

File:

• trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c

@@ -246 +246 @@
             if (fKernel)
             {
-# if RTLNX_VER_MIN(6,6,0)
+# if RTLNX_VER_MIN(6,6,0) || RTLNX_SUSE_MAJ_PREREQ(15, 6)
                 /* In kernel 6.6 mk_pte() macro was fortified with additional
                  * check which does not allow to use our custom mask anymore
@@ -1467 +1467 @@
                                 fWrite,                 /* force write access. */
 # endif
-                                &pMemLnx->apPages[0]    /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
-                                , papVMAs               /* vmas */
-# endif
+                                &pMemLnx->apPages[0],    /* Page array. */
+                                papVMAs               /* vmas */
                                 );
 #endif /* GET_USER_PAGES_API < KERNEL_VERSION(4, 6, 0) */
@@ -1494 +1492 @@
             {
                 flush_dcache_page(pMemLnx->apPages[rc]);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
 #  if RTLNX_VER_MIN(6,3,0)
                 vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);