Changeset 13666 in vbox

Timestamp:

Oct 29, 2008 5:46:13 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38611

Message:

rtR0MemObjNativeMapUser/linux: vm_insert_page should not be used when we don't have page structures to map (unused case).

File:

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

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

@@ -1064 +1064 @@
 #if   defined(VBOX_USE_INSERT_PAGE) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
                     rc = vm_insert_page(vma, ulAddrCur, pMemLnxToMap->apPages[iPage]);
-                    /** @todo nike: not sure if really needed to have this flag */
-                    vma->vm_flags |= VM_RESERVED;
+                    vma->vm_flags |= VM_RESERVED; /* This flag helps making 100% sure some bad stuff wont happen (swap, core, ++). */
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
                     rc = remap_pfn_range(vma, ulAddrCur, page_to_pfn(pMemLnxToMap->apPages[iPage]), PAGE_SIZE, fPg);
@@ -1098 +1097 @@
 #endif
 
-#if   defined(VBOX_USE_INSERT_PAGE) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
-                        rc = vm_insert_page(vma, ulAddrCur, pMemLnxToMap->apPages[iPage]);
-                        /** @todo nike: not sure if really needed to have this flag */
-                        vma->vm_flags |= VM_RESERVED;
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
+#if   LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
                         rc = remap_pfn_range(vma, ulAddrCur, Phys, PAGE_SIZE, fPg);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) || defined(HAVE_26_STYLE_REMAP_PAGE_RANGE)