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

Timestamp:

Oct 16, 2007 11:53:19 AM (17 years ago)

Author:

vboxsync

Message:

use segkmem_alloc on 64-bit solaris because of gcc and its kernel code model.

File:

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

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

@@ -36 +36 @@
     Assert(cb != sizeof(void *));
     PRTMEMHDR pHdr;
+#ifdef RT_ARCH_AMD64
+    if (fFlags & RTMEMHDR_FLAG_EXEC)
+        pHdr = (PRTMEMHDR)segkmem_alloc(heaptext_arena, cb + sizeof(*pHdr), KM_SLEEP);
+    else
+#endif
     if (fFlags & RTMEMHDR_FLAG_ZEROED)
         pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), KM_SLEEP);
@@ -59 +64 @@
 {
     pHdr->u32Magic += 1;
-    kmem_free(pHdr, pHdr->cb + sizeof(*pHdr));
+#ifdef RT_ARCH_AMD64
+    if (pHdr->fFlags & RTMEMHDR_FLAG_EXEC)
+        segkmem_free(heaptext_arena, pHdr, pHdr->cb + sizeof(*pHdr));
+    else
+#endif
+        kmem_free(pHdr, pHdr->cb + sizeof(*pHdr));
 }