diff --git a/bochs/cpu/cpu.h b/bochs/cpu/cpu.h
index cd2af377f..df86cd37a 100644
--- a/bochs/cpu/cpu.h
+++ b/bochs/cpu/cpu.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.h,v 1.532 2008-10-06 20:06:30 sshwarts Exp $
+// $Id: cpu.h,v 1.533 2008-10-08 11:14:35 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -3301,6 +3301,20 @@ public: // for now...
 #endif
 };
 
+#if BX_SUPPORT_MMX
+BX_CPP_INLINE void BX_CPU_C::prepareMMX(void)
+{
+  if(BX_CPU_THIS_PTR cr0.get_EM())
+    exception(BX_UD_EXCEPTION, 0, 0);
+
+  if(BX_CPU_THIS_PTR cr0.get_TS())
+    exception(BX_NM_EXCEPTION, 0, 0);
+
+  /* check floating point status word for a pending FPU exceptions */
+  FPU_check_pending_exceptions();
+}
+#endif
+
 #if BX_SUPPORT_SSE
 BX_CPP_INLINE void BX_CPU_C::prepareSSE(void)
 {
diff --git a/bochs/cpu/mmx.cc b/bochs/cpu/mmx.cc
index 38c6ba847..6b658216c 100644
--- a/bochs/cpu/mmx.cc
+++ b/bochs/cpu/mmx.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: mmx.cc,v 1.82 2008-10-08 10:51:38 sshwarts Exp $
+// $Id: mmx.cc,v 1.83 2008-10-08 11:14:35 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //   Copyright (c) 2002 Stanislav Shwartsman
@@ -36,18 +36,6 @@ void BX_CPU_C::print_state_MMX(void)
   }
 }
 
-void BX_CPU_C::prepareMMX(void)
-{
-  if(BX_CPU_THIS_PTR cr0.get_EM())
-    exception(BX_UD_EXCEPTION, 0, 0);
-
-  if(BX_CPU_THIS_PTR cr0.get_TS())
-    exception(BX_NM_EXCEPTION, 0, 0);
-
-  /* check floating point status word for a pending FPU exceptions */
-  FPU_check_pending_exceptions();
-}
-
 void BX_CPU_C::prepareFPU2MMX(void)
 {
   FPU_TAG_WORD = 0;