Changeset 21992 in vbox

Timestamp:

Aug 5, 2009 12:29:09 PM (15 years ago)

Author:

vboxsync

Message:

MMR3HyperSetGuard: simplify.

File:

• trunk/src/VBox/VMM/MMHyper.cpp (modified) (1 diff)

trunk/src/VBox/VMM/MMHyper.cpp

@@ -1100 +1100 @@
      */
     uint8_t    *pbR3  = (uint8_t *)pLookup->u.Locked.pvR3;
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE
-    RTR0PTR     R0Ptr = VMMIsHwVirtExtForced(pVM) ? pLookup->u.Locked.pvR0 : NIL_RTR0PTR;
-#else
-    RTR0PTR     R0Ptr = NIL_RTR0PTR; /* ring-0 and ring-3 uses the same mapping. */
-#endif
+    RTR0PTR     R0Ptr = pLookup->u.Locked.pvR0 != (uintptr_t)pLookup->u.Locked.pvR3
+                      ? pLookup->u.Locked.pvR0
+                      : NIL_RTR0PTR;
     uint32_t    off   = (uint32_t)((uint8_t *)pvStart - pbR3);
     int         rc;