3 files changed, 8 insertions, 8 deletions
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c
index d9f1e1aa47..15a5f61ddd 100644
--- a/cpukit/score/cpu/i386/cpu.c
+++ b/cpukit/score/cpu/i386/cpu.c
@@ -37,8 +37,8 @@ void _CPU_Initialize(
 )
 {
 #if CPU_HARDWARE_FP
-  register uint16_t    fp_status asm ("ax");
-  register void       *fp_context;
+  register uint16_t		fp_status asm ("ax");
+  register Context_Control_fp  *fp_context;
 #endif
 
   _CPU_Table = *cpu_table;
diff --git a/cpukit/score/cpu/m68k/cpu.c b/cpukit/score/cpu/m68k/cpu.c
index c622115ea4..8e4161a53d 100644
--- a/cpukit/score/cpu/m68k/cpu.c
+++ b/cpukit/score/cpu/m68k/cpu.c
@@ -192,20 +192,20 @@ const unsigned char __BFFFOtable[256] = {
 #if (CPU_SOFTWARE_FP == TRUE)
 extern Context_Control_fp _fpCCR;
 
-void CPU_Context_save_fp (void **fp_context_ptr)
+void CPU_Context_save_fp (Context_Control_fp **fp_context_ptr)
 {
   Context_Control_fp *fp;
 
-  fp = (Context_Control_fp *) *fp_context_ptr;
+  fp = *fp_context_ptr;
 
   *fp = _fpCCR;
 }
 
-void CPU_Context_restore_fp (void **fp_context_ptr)
+void CPU_Context_restore_fp (Context_Control_fp **fp_context_ptr)
 {
   Context_Control_fp *fp;
 
-  fp = (Context_Control_fp *) *fp_context_ptr;
+  fp = *fp_context_ptr;
 
   _fpCCR = *fp;
 }
diff --git a/cpukit/score/cpu/m68k/rtems/score/cpu.h b/cpukit/score/cpu/m68k/rtems/score/cpu.h
index 4ae760d5af..033b2ebc73 100644
--- a/cpukit/score/cpu/m68k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/m68k/rtems/score/cpu.h
@@ -642,7 +642,7 @@ void _CPU_Context_switch(
  */
 
 void _CPU_Context_save_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 
 /*
@@ -652,7 +652,7 @@ void _CPU_Context_save_fp(
  */
 
 void _CPU_Context_restore_fp(
-  void **fp_context_ptr
+  Context_Control_fp **fp_context_ptr
 );
 
 #if (M68K_HAS_FPSP_PACKAGE == 1)