Index: /trunk/src/VBox/VMM/HWACCM.cpp
===================================================================
--- /trunk/src/VBox/VMM/HWACCM.cpp	(revision 20056)
+++ /trunk/src/VBox/VMM/HWACCM.cpp	(revision 20057)
@@ -307,5 +307,5 @@
      * Register the saved state data unit.
      */
-    int rc = SSMR3RegisterInternal(pVM, "HWACCM", 0, HWACCM_SSM_VERSION_3_0_X, sizeof(HWACCM),
+    int rc = SSMR3RegisterInternal(pVM, "HWACCM", 0, HWACCM_SSM_VERSION, sizeof(HWACCM),
                                    NULL, hwaccmR3Save, NULL,
                                    NULL, hwaccmR3Load, NULL);
@@ -1697,7 +1697,4 @@
     }
 
-    rc = SSMR3PutBool(pSSM, pVM->hwaccm.s.svm.fTPRPatching);
-    AssertRCReturn(rc, rc);
-
     return VINF_SUCCESS;
 }
@@ -1720,7 +1717,6 @@
      * Validate version.
      */
-    if (   u32Version != HWACCM_SSM_VERSION_2_2_X
-        && u32Version != HWACCM_SSM_VERSION_2_0_X
-        && u32Version != HWACCM_SSM_VERSION_3_0_X)
+    if (   u32Version != HWACCM_SSM_VERSION
+        && u32Version != HWACCM_SSM_VERSION_2_0_X)
     {
         AssertMsgFailed(("hwaccmR3Load: Invalid version u32Version=%d!\n", u32Version));
@@ -1736,5 +1732,5 @@
         AssertRCReturn(rc, rc);
 
-        if (u32Version >= HWACCM_SSM_VERSION_2_2_X)
+        if (u32Version >= HWACCM_SSM_VERSION)
         {
             uint32_t val;
@@ -1753,11 +1749,4 @@
         }
     }
-
-    if (u32Version >= HWACCM_SSM_VERSION_3_0_X)
-    {
-        rc = SSMR3GetBool(pSSM, &pVM->hwaccm.s.svm.fTPRPatching);
-        AssertRCReturn(rc, rc);
-    }
-
     return VINF_SUCCESS;
 }
Index: /trunk/src/VBox/VMM/HWACCMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/HWACCMInternal.h	(revision 20056)
+++ /trunk/src/VBox/VMM/HWACCMInternal.h	(revision 20057)
@@ -135,6 +135,5 @@
 /** HWACCM SSM version
  */
-#define HWACCM_SSM_VERSION_3_0_X            5
-#define HWACCM_SSM_VERSION_2_2_X            4
+#define HWACCM_SSM_VERSION                  4
 #define HWACCM_SSM_VERSION_2_0_X            3
 
@@ -341,6 +340,7 @@
         /** Set if erratum 170 affects the AMD cpu. */
         bool                        fAlwaysFlushTLB;
-        /** Set if we're patching 32 bits guests to get rid of TPR access overhead. */
-        bool                        fTPRPatching;
+        /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
+         *  naturally. */
+        bool                        padding[1];
 
         /** R0 memory object for the host VM control block (VMCB). */