Index: /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c
===================================================================
--- /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c	(revision 32918)
+++ /trunk/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c	(revision 32919)
@@ -1303,5 +1303,5 @@
 				/*
 				 * get pages from kseg, the 'virtAddr' here is only for colouring but unforuntately
-				 * we dont' have the 'virtAddr' to which this memory may be mapped.
+				 * we don't have the 'virtAddr' to which this memory may be mapped.
 				 */
 				seg_t kernseg;
Index: /trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c
===================================================================
--- /trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c	(revision 32918)
+++ /trunk/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c	(revision 32919)
@@ -179,11 +179,11 @@
     uint64_t physAddr = PhysHighest;
 
-#if 0
+# if 0
     /*
      * The contig_alloc() way of allocating NC pages is broken or does not match our semantics. Refer #4716 for details.
      */
-#if 0
+#  if 0
     /* caddr_t virtAddr  = vbi_phys_alloc(&physAddr, cb, PAGE_SIZE, 0 /* non-contiguous */);
-#endif
+#  endif
     caddr_t virtAddr = ddi_umem_alloc(cb, DDI_UMEM_SLEEP, &pMemSolaris->Cookie);
     if (RT_UNLIKELY(virtAddr == NULL))
@@ -196,5 +196,5 @@
     pMemSolaris->Core.u.Phys.fAllocated = true;
     pMemSolaris->pvHandle = NULL;
-#else
+# else
     void *pvPages = vbi_pages_alloc(&physAddr, cb);
     if (!pvPages)
@@ -208,5 +208,5 @@
     pMemSolaris->Core.u.Phys.fAllocated = false;
     pMemSolaris->pvHandle = pvPages;
-#endif
+# endif
 
     Assert(!(physAddr & PAGE_OFFSET_MASK));
@@ -456,6 +456,4 @@
         return VERR_MAP_FAILED;
     }
-    else
-        rc = VINF_SUCCESS;
 
     pMemSolaris->Core.u.Mapping.R0Process = (RTR0PROCESS)vbi_proc();
@@ -463,5 +461,5 @@
     *ppMem = &pMemSolaris->Core;
     kmem_free(paPhysAddrs, sizeof(uint64_t) * cPages);
-    return rc;
+    return VINF_SUCCESS;
 }