Merge branch 'sfc-3.9' into master

[karo-tx-linux.git] / arch / mips / kernel / proc.c

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 07dff54f2ce8b238e4b955082ed12bf9e2f1fd43..135c4aadccbe35d9a49415170dce3d2b9e05a697 100644 (file)
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 1995, 1996, 2001  Ralf Baechle
  *  Copyright (C) 2001, 2004  MIPS Technologies, Inc.
- *  Copyright (C) 2004  Maciej W. Rozycki
+ *  Copyright (C) 2004 Maciej W. Rozycki
  */
 #include <linux/delay.h>
 #include <linux/kernel.h>
@@ -64,6 +64,28 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                cpu_data[n].watch_reg_masks[i]);
                seq_printf(m, "]\n");
        }
+       if (cpu_has_mips_r) {
+               seq_printf(m, "isa\t\t\t:");
+               if (cpu_has_mips_1)
+                       seq_printf(m, "%s", "mips1");
+               if (cpu_has_mips_2)
+                       seq_printf(m, "%s", " mips2");
+               if (cpu_has_mips_3)
+                       seq_printf(m, "%s", " mips3");
+               if (cpu_has_mips_4)
+                       seq_printf(m, "%s", " mips4");
+               if (cpu_has_mips_5)
+                       seq_printf(m, "%s", " mips5");
+               if (cpu_has_mips32r1)
+                       seq_printf(m, "%s", " mips32r1");
+               if (cpu_has_mips32r2)
+                       seq_printf(m, "%s", " mips32r2");
+               if (cpu_has_mips64r1)
+                       seq_printf(m, "%s", " mips64r1");
+               if (cpu_has_mips64r2)
+                       seq_printf(m, "%s", " mips64r2");
+               seq_printf(m, "\n");
+       }
 
        seq_printf(m, "ASEs implemented\t:");
        if (cpu_has_mips16)     seq_printf(m, "%s", " mips16");
@@ -73,6 +95,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
        if (cpu_has_dsp)        seq_printf(m, "%s", " dsp");
        if (cpu_has_dsp2)       seq_printf(m, "%s", " dsp2");
        if (cpu_has_mipsmt)     seq_printf(m, "%s", " mt");
+       if (cpu_has_mmips)      seq_printf(m, "%s", " micromips");
+       if (cpu_has_vz)         seq_printf(m, "%s", " vz");
        seq_printf(m, "\n");
 
        seq_printf(m, "shadow register sets\t: %d\n",