Index: /trunk/src/VBox/VMM/include/HWACCMInternal.h
===================================================================
--- /trunk/src/VBox/VMM/include/HWACCMInternal.h	(revision 42820)
+++ /trunk/src/VBox/VMM/include/HWACCMInternal.h	(revision 42821)
@@ -41,5 +41,6 @@
 #define HWACCM_VMX_EMULATE_REALMODE
 
-
+/** @todo: Broken on OS X Snow Leopard @bugref{6313}. */
+#if !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
 /* The MSR auto load/store does not work for KERNEL_GS_BASE MSR, thus we
  * handle this MSR manually. See @bugref{6208}. This is clearly visible while
@@ -48,5 +49,6 @@
  * Note: don't forget to update the assembly files while modifying this!
  */
-#define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+# define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+#endif
 
 RT_C_DECLS_BEGIN
Index: /trunk/src/VBox/VMM/include/HWACCMInternal.mac
===================================================================
--- /trunk/src/VBox/VMM/include/HWACCMInternal.mac	(revision 42820)
+++ /trunk/src/VBox/VMM/include/HWACCMInternal.mac	(revision 42821)
@@ -16,5 +16,9 @@
 
 %define VMX_USE_CACHED_VMCS_ACCESSES
+
+/** @todo: Broken on OS X Snow Leopard @bugref{6313}. */
+%ifndef VBOX_WITH_HYBRID_32BIT_KERNEL
 %define VBOX_WITH_AUTO_MSR_LOAD_RESTORE
+%endif
 
 ;Maximum number of cached entries.