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

Timestamp:

Jan 25, 2007 5:45:36 AM (18 years ago)

Author:

vboxsync

Message:

compile fix

File:

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

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

@@ -53 +53 @@
 static RTHEAPSIMPLE g_HeapExec = NIL_RTHEAPSIMPLE;
 /** Spinlock protecting the heap. */
-static RTSPINLOCK   g_HeapExecSpinlock = NIL_RTHEAPSIMPLE;
+static RTSPINLOCK   g_HeapExecSpinlock = NIL_RTSPINLOCK;
 
 
@@ -84 +84 @@
 RTDECL(int) RTMemExecDonate(void *pvMemory, size_t cb)
 {
+    int rc;
     AssertReturn(g_HeapExec == NIL_RTHEAPSIMPLE, VERR_WRONG_ORDER);
 
-    int rc = RTSpinlockCreate(&g_HeapExecSpinlock);
+    rc = RTSpinlockCreate(&g_HeapExecSpinlock);
     if (RT_SUCCESS(rc))
     {
@@ -115 +116 @@
         if (g_HeapExec != NIL_RTHEAPSIMPLE)
         {
-            fFlags |= RTMEMHDR_FLAG_EXEC_HEAP;
             RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
             RTSpinlockAcquireNoInts(g_HeapExecSpinlock, &SpinlockTmp);
             pHdr = (PRTMEMHDR)RTHeapSimpleAlloc(g_HeapExec, cb + sizeof(*pHdr), 0);
             RTSpinlockReleaseNoInts(g_HeapExecSpinlock, &SpinlockTmp);
+            fFlags |= RTMEMHDR_FLAG_EXEC_HEAP;
         }
         else
@@ -168 +169 @@
     else if (pHdr->fFlags & RTMEMHDR_FLAG_EXEC_HEAP)
     {
+        RTSPINLOCKTMP SpinlockTmp = RTSPINLOCKTMP_INITIALIZER;
         RTSpinlockAcquireNoInts(g_HeapExecSpinlock, &SpinlockTmp);
         RTHeapSimpleFree(g_HeapExec, pHdr);