Changeset 41680 in vbox

Timestamp:

Jun 13, 2012 11:19:56 AM (13 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/solaris: cleanup.

File:

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

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

@@ -135 +135 @@
  * @param virtAddr       The virtual address to which this page maybe mapped in
  *                       the future.
- * @param cbPage         The size of the page.
  *
  * @returns Pointer to the allocated page, NULL on failure.
  */
-static page_t *rtR0MemObjSolPageAlloc(caddr_t virtAddr, size_t cbPage)
-{
-    Assert(cbPage == PAGE_SIZE);
-
-    u_offset_t offPage;
-    seg_t      KernelSeg;
+static page_t *rtR0MemObjSolPageAlloc(caddr_t virtAddr)
+{
+    u_offset_t      offPage;
+    seg_t           KernelSeg;
 
     mutex_enter(&g_OffsetMtx);
     AssertCompileSize(u_offset_t, sizeof(uint64_t)); NOREF(RTASSERTVAR);
-    g_offPage = RT_ALIGN_64(g_offPage, cbPage) + cbPage;
+    g_offPage = RT_ALIGN_64(g_offPage, PAGE_SIZE) + PAGE_SIZE;
     offPage   = g_offPage;
     mutex_exit(&g_OffsetMtx);
 
     KernelSeg.s_as = &kas;
-    page_t *pPage = page_create_va(&g_PageVnode, offPage, cbPage, PG_WAIT | PG_NORELOC, &KernelSeg, virtAddr);
+    page_t *pPage = page_create_va(&g_PageVnode, offPage, PAGE_SIZE, PG_WAIT | PG_NORELOC, &KernelSeg, virtAddr);
     if (RT_LIKELY(pPage))
     {
         /*
-         * Lock this page into memory "long term" to prevent paging out of this page
+         * Lock this page into memory "long term" to prevent this page from being paged out
          * when we drop the page lock temporarily (during free).
          */
@@ -214 +211 @@
                  * from being relocated.
                  */
-                page_t *pPage = rtR0MemObjSolPageAlloc(virtAddr, PAGE_SIZE);
+                page_t *pPage = rtR0MemObjSolPageAlloc(virtAddr);
                 if (RT_UNLIKELY(!pPage))
                 {
                     /*
-                     * No pages found or found pages didn't meet requirements, release what was grabbed so far.
+                     * No page found, release whatever pages we grabbed so far.
                      */
                     for (size_t k = 0; k < i; k++)