Changeset 50113 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 20, 2014 11:57:31 AM (11 years ago)

Author:

vboxsync

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

91655

Message:

Because of the CPUID leaves we'll need the heap to always be mapped into ring-0 in the VBOX_WITH_2X_4GB_ADDR_SPACE case (mac).

File:

• trunk/src/VBox/VMM/VMMR3/MMHyper.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/MMHyper.cpp

@@ -817 +817 @@
                               &pv,
 #ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-                              HMIsEnabled(pVM) ? &pvR0 : NULL,
+                              &pvR0,
 #else
                               NULL,
@@ -824 +824 @@
     if (RT_SUCCESS(rc))
     {
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-        if (!HMIsEnabled(pVM))
-            pvR0 = NIL_RTR0PTR;
-#else
+#ifndef VBOX_WITH_2X_4GB_ADDR_SPACE
         pvR0 = (uintptr_t)pv;
 #endif