Changeset 58698 in vbox for trunk/src/VBox/HostDrivers/Support/solaris

Timestamp:

Nov 16, 2015 2:57:02 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104125

Message:

Solaris/r0drv,SUPDrv: backed out r104124 (On second thought, this is too dangerous)

File:

• trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c

@@ -1273 +1273 @@
     char        szMsg[512];
 
+    /* cmn_err() acquires adaptive mutexes. Not preemption safe, see @bugref{6657}. */
+    if (!RTThreadPreemptIsEnabled(NIL_RTTHREAD))
+        return 0;
+
     va_start(args, pszFormat);
     RTStrPrintfV(szMsg, sizeof(szMsg) - 1, pszFormat, args);
@@ -1278 +1282 @@
 
     szMsg[sizeof(szMsg) - 1] = '\0';
-    /* cmn_err() acquires adaptive mutexes. Not preemption safe, see @bugref{6657}. */
-    if (RTThreadPreemptIsEnabled(NIL_RTTHREAD))
-        cmn_err(CE_CONT, "%s", szMsg);
-    else
-        cmn_err(CE_CONT, "[!BadPreemptCtx!] %s", szMsg);
+    cmn_err(CE_CONT, "%s", szMsg);
     return 0;
 }