CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/08/20 14:47:40

Modified files:
        include/asm-mips: cpu-features.h 

Log message:
        Make sure CONFIG_MIPS_MT really disables all of MT.

diff -urN linux/include/asm-mips/cpu-features.h 
linux/include/asm-mips/cpu-features.h
--- linux/include/asm-mips/cpu-features.h       2005/08/16 16:26:32     1.16
+++ linux/include/asm-mips/cpu-features.h       2005/08/20 13:47:40     1.17
@@ -109,6 +109,14 @@
 #define cpu_has_dsp            (cpu_data[0].ases & MIPS_ASE_DSP)
 #endif
 
+#ifdef CONFIG_MIPS_MT
+#ifndef cpu_has_mipsmt
+# define cpu_has_mipsmt                (cpu_data[0].ases & MIPS_ASE_MIPSMT)
+#endif
+#else
+# define cpu_has_mipsmt                0
+#endif
+
 #ifdef CONFIG_32BIT
 # ifndef cpu_has_nofpuex
 # define cpu_has_nofpuex       (cpu_data[0].options & MIPS_CPU_NOFPUEX)
@@ -126,9 +134,6 @@
 # define cpu_has_64bit_addresses       0
 # endif
 #endif
-#ifndef cpu_has_mipsmt
-# define cpu_has_mipsmt                (cpu_data[0].ases & MIPS_ASE_MIPSMT)
-#endif
 
 #ifdef CONFIG_64BIT
 # ifndef cpu_has_nofpuex