Index: /trunk/include/VBox/uvm.h
===================================================================
--- /trunk/include/VBox/uvm.h	(revision 22931)
+++ /trunk/include/VBox/uvm.h	(revision 22932)
@@ -50,8 +50,6 @@
     /** The virtual CPU ID.  */
     RTCPUID                         idCpu;
-#if HC_ARCH_BITS == 64
     /** Alignment padding. */
-    uint32_t                        u32Alignment0;
-#endif
+    uint8_t                         abAlignment0[HC_ARCH_BITS == 32 ? 16 : 4];
 
     /** The VM internal data. */
@@ -64,5 +62,5 @@
     } vm;
 } UVMCPU;
-AssertCompileMemberAlignment(UVMCPU, vm, 8);
+AssertCompileMemberAlignment(UVMCPU, vm, 32);
 
 
@@ -136,11 +134,5 @@
 AssertCompileMemberAlignment(UVM, pdm, 32);
 AssertCompileMemberAlignment(UVM, stam, 32);
-AssertCompileMemberAlignment(UVM, aCpus, 2);
-AssertCompileMemberAlignment(UVM, aCpus, 4);
-AssertCompileMemberAlignment(UVM, aCpus, 8);
-AssertCompileMemberAlignment(UVM, aCpus, 16);
 AssertCompileMemberAlignment(UVM, aCpus, 32);
-AssertCompileMemberAlignment(UVM, aCpus[1], 4);
-AssertCompileMemberAlignment(UVM, aCpus[1], 8);
 
 /** The UVM::u32Magic value (Brad Mehldau). */