diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 6e7687dc0e..a260615b03 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-22	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1782/cpukit
+	* score/include/rtems/score/thread.h: Disable deferred FPU context
+	switches when SMP is enabled. Per code tracking of deferred contexts
+	is not implemented.
+
 2011-04-21	Jennifer Averett <Jennifer.Averett@OARcorp.com
 
 	PR 1777/cpukit
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 237fbde59c..0453912a46 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -58,6 +58,15 @@
   #define __THREAD_DO_NOT_INLINE_ENABLE_DISPATCH__
 #endif
 
+/*
+ *  Deferred floating point context switches are not currently
+ *  supported when in SMP configuration.
+ */
+#if defined(RTEMS_SMP)
+  #undef  CPU_USE_DEFERRED_FP_SWITCH
+  #define CPU_USE_DEFERRED_FP_SWITCH FALSE
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif