Changeset 43637 in vbox

Timestamp:

Oct 15, 2012 11:14:33 AM (12 years ago)

Author:

vboxsync

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

81384

Message:

Linux 3.7 fixes

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c (modified) (1 diff)

trunk/Config.kmk

@@ -2785 +2785 @@
                        $(kernelpath)/arch/x86/include \
                        $(kernelpath)/arch/x86/include/asm/mach-default \
+                       $(kernelpath)/arch/x86/include/uapi \
                        $(kernelpath)/arch/x86/include/generated \
+                       $(kernelpath)/arch/x86/include/generated/uapi \
+                       $(kernelpath)/include/uapi \
+                       $(kernelpath)/include/generated/uapi \
                        $(kernelpath)/include
   endif

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

@@ -1458 +1458 @@
 #if   defined(VBOX_USE_INSERT_PAGE) && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
                     rc = vm_insert_page(vma, ulAddrCur, pMemLnxToMap->apPages[iPage]);
-                    vma->vm_flags |= VM_RESERVED; /* This flag helps making 100% sure some bad stuff wont happen (swap, core, ++). */
+                    /* Thes flags help making 100% sure some bad stuff wont happen (swap, core, ++).
+                     * See remap_pfn_range() in mm/memory.c */
+#if    LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
+                    vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
+#else
+                    vma->vm_flags |= VM_RESERVED;
+#endif
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 11)
                     rc = remap_pfn_range(vma, ulAddrCur, page_to_pfn(pMemLnxToMap->apPages[iPage]), PAGE_SIZE, fPg);