Index: /trunk/src/VBox/Main/ConsoleImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 30841)
+++ /trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 30842)
@@ -4981,22 +4981,4 @@
         RTLogRelLogger(loggerRelease, 0, ~0U, "Host RAM: %uMB RAM, available: %uMB\n",
                        cMbHostRam, cMbHostRamAvail);
-
-#if defined(RT_OS_WINDOWS) && HC_ARCH_BITS == 32
-        /* @todo move this in RT, but too lazy now */
-        uint32_t maxRAMArch;
-        SYSTEM_INFO sysInfo;
-        GetSystemInfo(&sysInfo);
-
-        if (sysInfo.lpMaximumApplicationAddress >= (LPVOID)0xC0000000)   /* 3.0 GB */
-            maxRAMArch = UINT32_C(2560);
-        else
-        if (sysInfo.lpMaximumApplicationAddress > (LPVOID)0xA0000000)    /* 2.5 GB */
-            maxRAMArch = UINT32_C(2048);
-        else
-            maxRAMArch = UINT32_C(1500);
-
-        RTLogRelLogger(loggerRelease, 0, ~0U, "Maximum user application address: 0x%p\n", sysInfo.lpMaximumApplicationAddress);
-        RTLogRelLogger(loggerRelease, 0, ~0U, "Maximum allowed guest RAM size:   %dMB\n", maxRAMArch);
-#endif
 
         /* the package type is interesting for Linux distributions */
Index: /trunk/src/VBox/Main/SystemPropertiesImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/SystemPropertiesImpl.cpp	(revision 30841)
+++ /trunk/src/VBox/Main/SystemPropertiesImpl.cpp	(revision 30842)
@@ -204,20 +204,4 @@
     ULONG maxRAMSys = MM_RAM_MAX_IN_MB;
     ULONG maxRAMArch = maxRAMSys;
-#if HC_ARCH_BITS == 32 && !defined(RT_OS_DARWIN)
-# ifdef RT_OS_WINDOWS
-    SYSTEM_INFO sysInfo;
-    GetSystemInfo(&sysInfo);
-
-    if (sysInfo.lpMaximumApplicationAddress >= (LPVOID)0xC0000000)   /* 3.0 GB */
-        maxRAMArch = UINT32_C(2560);
-    else
-    if (sysInfo.lpMaximumApplicationAddress > (LPVOID)0xA0000000)    /* 2.5 GB */
-        maxRAMArch = UINT32_C(2048);
-    else
-        maxRAMArch = UINT32_C(1500);
-# else
-    maxRAMArch = UINT32_C(2560);
-# endif
-#endif
     *maxRAM = RT_MIN(maxRAMSys, maxRAMArch);
 
Index: /trunk/src/VBox/VMM/PGMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/PGMInternal.h	(revision 30841)
+++ /trunk/src/VBox/VMM/PGMInternal.h	(revision 30842)
@@ -88,4 +88,11 @@
 #if (HC_ARCH_BITS == 64) && !defined(IN_RC)
 # define PGM_WITH_LARGE_PAGES
+#endif
+
+/**
+ * Chunk unmapping code activated on 32-bit hosts for > 1.5/2 GB guest memory support
+ */
+#if (HC_ARCH_BITS == 32) && !defined(RT_OS_DARWIN)
+# define PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
 #endif
 
Index: /trunk/src/VBox/VMM/PGMPhys.cpp
===================================================================
--- /trunk/src/VBox/VMM/PGMPhys.cpp	(revision 30841)
+++ /trunk/src/VBox/VMM/PGMPhys.cpp	(revision 30842)
@@ -3188,5 +3188,5 @@
 }
 
-#ifdef VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
+#ifdef PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
 /**
  * Tree enumeration callback for dealing with age rollover.
@@ -3429,5 +3429,5 @@
     AssertRC(rc);
 }
-#endif /* VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST */
+#endif /* PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST */
 
 /**
@@ -3488,5 +3488,5 @@
         if (pVM->pgm.s.ChunkR3Map.c >= pVM->pgm.s.ChunkR3Map.cMax)
         {
-#ifdef VBOX_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
+#ifdef PGM_WITH_LARGE_ADDRESS_SPACE_ON_32_BIT_HOST
             /* Postpone the unmap operation (which requires a rendezvous operation) as we own the PGM lock here. */
             rc = VMR3ReqCallNoWaitU(pVM->pUVM, VMCPUID_ANY, (PFNRT)pgmR3PhysUnmapChunk, 1, pVM);