Changeset 52420 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Aug 19, 2014 7:42:35 PM (10 years ago)

Author:

vboxsync

Message:

Runtime, VBoxNetAdp: Linux 3.17 fixes

File:

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

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

@@ -188 +188 @@
     {
         /*
-         * Map the pages.  The API requires an iterator argument, which can be
-         * used, in case of failure, to figure out how much was actually
-         * mapped.  Not sure how useful this really is, but whatever.
+         * Map the pages.
          *
          * Not entirely sure we really need to set nr_pages and pages here, but
@@ -196 +194 @@
          * in the free function, if nothing else...
          */
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
         struct page **papPagesIterator = papPages;
+# endif
         pVmArea->nr_pages = cPages;
         pVmArea->pages    = papPages;
-        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator))
+        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC,
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
+                         &papPagesIterator
+# else
+                         papPages
+# endif
+                         ))
         {
             PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
@@ -206 +212 @@
             return &pHdrEx->Hdr;
         }
-
         /* bail out */
+# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)
         pVmArea->nr_pages = papPagesIterator - papPages;
+# endif
     }