Index: /trunk/src/VBox/VMM/PGMInline.h
===================================================================
--- /trunk/src/VBox/VMM/PGMInline.h	(revision 30823)
+++ /trunk/src/VBox/VMM/PGMInline.h	(revision 30824)
@@ -590,8 +590,6 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return pGuestPD->a[GCPtr >> X86_PD_SHIFT];
@@ -614,8 +612,6 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return &pGuestPD->a[GCPtr >> X86_PD_SHIFT];
@@ -637,8 +633,6 @@
 #else
     PX86PD pGuestPD = pPGM->CTX_SUFF(pGst32BitPd);
-# ifdef IN_RING3
-    if (!pGuestPD)
+    if (RT_UNLIKELY(!pGuestPD))
         pGuestPD = pgmGstLazyMap32BitPD(pPGM);
-# endif
 #endif
     return pGuestPD;
@@ -661,8 +655,6 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef IN_RING3
-    if (!pGuestPDPT)
+    if (RT_UNLIKELY(!pGuestPDPT))
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 #endif
     return pGuestPDPT;
@@ -688,8 +680,6 @@
 #else
     PX86PDPT pGuestPDPT = pPGM->CTX_SUFF(pGstPaePdpt);
-# ifdef IN_RING3
-    if (!pGuestPDPT)
+    if (RT_UNLIKELY(!pGuestPDPT))
         pGuestPDPT = pgmGstLazyMapPaePDPT(pPGM);
-# endif
 #endif
     return &pGuestPDPT->a[(GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE];
@@ -858,8 +848,6 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
-    if (!pGuestPml4)
+    if (RT_UNLIKELY(!pGuestPml4))
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif
@@ -883,8 +871,6 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
-    if (!pGuestPml4)
+    if (RT_UNLIKELY(!pGuestPml4))
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif
@@ -912,8 +898,6 @@
 #else
     PX86PML4 pGuestPml4 = pPGM->CTX_SUFF(pGstAmd64Pml4);
-# ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
     if (!pGuestPml4)
         pGuestPml4 = pgmGstLazyMapPml4(pPGM);
-# endif
     Assert(pGuestPml4);
 #endif
Index: /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp	(revision 30823)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp	(revision 30824)
@@ -1367,5 +1367,4 @@
 }
 
-#ifdef IN_RING3
 
 /**
@@ -1426,5 +1425,4 @@
 }
 
-#endif /* IN_RING3  */
 
 #ifndef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
@@ -1492,6 +1490,5 @@
 #endif /* !VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0 */
 
-
-#ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3
+#ifndef IN_RC
 /**
  * Performs the lazy mapping of the 32-bit guest PD.
@@ -1521,6 +1518,5 @@
     return pPGM->CTX_SUFF(pGstAmd64Pml4);
 }
-#endif /* VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 */
-
+#endif
 
 /**