m68k: report correct FPU type on ColdFire MMU platforms

Not all ColdFire SoC parts that have an MMU also have an FPU - so set
an FPU type (via m68k_fputype) appropriate for the configured platform.

With this set correctly /proc/cpuinfo will report FPU "none" on devices
that don't have one. And kernel code paths that initialize FPU hardware
will now only execute if an FPU is actually present.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>

3 files changed, 4 insertions, 2 deletions

diff --git a/arch/m68k/coldfire/head.S b/arch/m68k/coldfire/head.S
index 4ba5d5628067..bdb472c48401 100644
--- a/arch/m68k/coldfire/head.S
+++ b/arch/m68k/coldfire/head.S
@@ -280,8 +280,8 @@ _clear_bss:
         movel   %d0,m68k_cputype                /* Mark us as a ColdFire */
         movel   #MMU_COLDFIRE,%d0
         movel   %d0,m68k_mmutype
-        movel   #FPU_COLDFIRE,%d0
-        movel   %d0,m68k_fputype
+        movel   #FPUTYPE,%d0
+        movel   %d0,m68k_fputype                /* Mark FPU type */
         movel   #MACHINE,%d0
         movel   %d0,m68k_machtype               /* Mark machine type */
         lea     init_task,%a2                   /* Set "current" init task */
diff --git a/arch/m68k/include/asm/m5441xsim.h b/arch/m68k/include/asm/m5441xsim.h
index 60768b5973db..4279c0df0844 100644
--- a/arch/m68k/include/asm/m5441xsim.h
+++ b/arch/m68k/include/asm/m5441xsim.h
@@ -11,6 +11,7 @@
 #define CPU_INSTR_PER_JIFFY     2
 #define MCF_BUSCLK              (MCF_CLK / 2)
 #define MACHINE                 MACH_M5441X
+#define FPUTYPE                 0
 
 #include <asm/m54xxacr.h>
 
diff --git a/arch/m68k/include/asm/m54xxsim.h b/arch/m68k/include/asm/m54xxsim.h
index cde03902da24..7dd6cc4bcd72 100644
--- a/arch/m68k/include/asm/m54xxsim.h
+++ b/arch/m68k/include/asm/m54xxsim.h
@@ -9,6 +9,7 @@
 #define CPU_INSTR_PER_JIFFY     2
 #define MCF_BUSCLK              (MCF_CLK / 2)
 #define MACHINE                 MACH_M54XX
+#define FPUTYPE                 FPU_COLDFIRE
 
 #include <asm/m54xxacr.h>