Index: /trunk/include/VBox/pgm.h
===================================================================
--- /trunk/include/VBox/pgm.h	(revision 24694)
+++ /trunk/include/VBox/pgm.h	(revision 24695)
@@ -356,7 +356,5 @@
 VMMDECL(int)        PGMPhysGCPtr2GCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTGCPHYS pGCPhys);
 VMMDECL(int)        PGMPhysGCPtr2HCPhys(PVMCPU pVCpu, RTGCPTR GCPtr, PRTHCPHYS pHCPhys);
-VMMDECL(void)       PGMPhysInvalidatePageGCMapTLB(PVM pVM);
-VMMDECL(void)       PGMPhysInvalidatePageR0MapTLB(PVM pVM);
-VMMDECL(void)       PGMPhysInvalidatePageR3MapTLB(PVM pVM);
+VMMDECL(void)       PGMPhysInvalidatePageMapTLB(PVM pVM);
 
 VMMDECL(int)        PGMPhysGCPhys2CCPtr(PVM pVM, RTGCPHYS GCPhys, void **ppv, PPGMPAGEMAPLOCK pLock);
Index: /trunk/src/VBox/VMM/PGM.cpp
===================================================================
--- /trunk/src/VBox/VMM/PGM.cpp	(revision 24694)
+++ /trunk/src/VBox/VMM/PGM.cpp	(revision 24695)
@@ -1289,7 +1289,5 @@
 
     PGMR3PhysChunkInvalidateTLB(pVM);
-    PGMPhysInvalidatePageR3MapTLB(pVM);
-    PGMPhysInvalidatePageR0MapTLB(pVM);
-    PGMPhysInvalidatePageGCMapTLB(pVM);
+    PGMPhysInvalidatePageMapTLB(pVM);
 
     /*
Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 24694)
+++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp	(revision 24695)
@@ -192,32 +192,9 @@
 
 /**
- * Invalidates the GC page mapping TLB.
+ * Invalidates the all page mapping TLBs.
  *
  * @param   pVM     The VM handle.
  */
-VMMDECL(void) PGMPhysInvalidatePageGCMapTLB(PVM pVM)
-{
-    /* later */
-    NOREF(pVM);
-}
-
-#ifndef IN_RC
-/**
- * Invalidates the ring-0 page mapping TLB.
- *
- * @param   pVM     The VM handle.
- */
-VMMDECL(void) PGMPhysInvalidatePageR0MapTLB(PVM pVM)
-{
-    PGMPhysInvalidatePageR3MapTLB(pVM);
-}
-
-
-/**
- * Invalidates the ring-3 page mapping TLB.
- *
- * @param   pVM     The VM handle.
- */
-VMMDECL(void) PGMPhysInvalidatePageR3MapTLB(PVM pVM)
+VMMDECL(void) PGMPhysInvalidatePageMapTLB(PVM pVM)
 {
     pgmLock(pVM);
@@ -229,7 +206,7 @@
         pVM->pgm.s.PhysTlbHC.aEntries[i].pv = 0;
     }
+    /* @todo clear the RC TLB whenever we add it. */
     pgmUnlock(pVM);
 }
-#endif /* ! IN_RC */
 
 /**