MIPS: Reorganize ISA constants strictly as bitmasks.

    
Signed-off-by: Ralf Baechle <ralf@ongar.mips.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/include/asm-mips/cpu.h b/include/asm-mips/cpu.h
index 48c37c46053a..934e063e79f1 100644
--- a/include/asm-mips/cpu.h
+++ b/include/asm-mips/cpu.h
@@ -202,17 +202,20 @@
  * ISA Level encodings
  *
  */
-#define MIPS_CPU_ISA_64BIT      0x00008000
-
 #define MIPS_CPU_ISA_I          0x00000001
 #define MIPS_CPU_ISA_II         0x00000002
-#define MIPS_CPU_ISA_III        (0x00000003 | MIPS_CPU_ISA_64BIT)
-#define MIPS_CPU_ISA_IV         (0x00000004 | MIPS_CPU_ISA_64BIT)
-#define MIPS_CPU_ISA_V          (0x00000005 | MIPS_CPU_ISA_64BIT)
+#define MIPS_CPU_ISA_III        0x00000003
+#define MIPS_CPU_ISA_IV         0x00000004
+#define MIPS_CPU_ISA_V          0x00000005
 #define MIPS_CPU_ISA_M32R1      0x00000020
 #define MIPS_CPU_ISA_M32R2      0x00000040
-#define MIPS_CPU_ISA_M64R1      (0x00000080 | MIPS_CPU_ISA_64BIT)
-#define MIPS_CPU_ISA_M64R2      (0x00000100 | MIPS_CPU_ISA_64BIT)
+#define MIPS_CPU_ISA_M64R1      0x00000080
+#define MIPS_CPU_ISA_M64R2      0x00000100
+
+#define MIPS_CPU_ISA_32BIT (MIPS_CPU_ISA_I | MIPS_CPU_ISA_II | \
+        MIPS_CPU_ISA_M32R1 | MIPS_CPU_ISA_M32R2 )
+#define MIPS_CPU_ISA_64BIT (MIPS_CPU_ISA_III | MIPS_CPU_ISA_IV | \
+        MIPS_CPU_ISA_V | MIPS_CPU_ISA_M64R1 | MIPS_CPU_ISA_M64R2)
 
 /*
  * CPU Option encodings