Merge branch 'master' into upstream

[powerpc.git] / arch / mips / kernel / proc.c

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index cf31d39..84ab959 100644 (file)
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -56,6 +56,7 @@ static const char *cpu_name[] = {
         [CPU_5KC]      = "MIPS 5Kc",
        [CPU_R4310]     = "R4310",
        [CPU_SB1]       = "SiByte SB1",
+       [CPU_SB1A]      = "SiByte SB1A",
        [CPU_TX3912]    = "TX3912",
        [CPU_TX3922]    = "TX3922",
        [CPU_TX3927]    = "TX3927",
@@ -72,6 +73,7 @@ static const char *cpu_name[] = {
        [CPU_20KC]      = "MIPS 20Kc",
        [CPU_24K]       = "MIPS 24K",
        [CPU_25KF]      = "MIPS 25Kf",
+       [CPU_34K]       = "MIPS 34K",
        [CPU_VR4111]    = "NEC VR4111",
        [CPU_VR4121]    = "NEC VR4121",
        [CPU_VR4122]    = "NEC VR4122",
@@ -79,7 +81,8 @@ static const char *cpu_name[] = {
        [CPU_VR4133]    = "NEC VR4133",
        [CPU_VR4181]    = "NEC VR4181",
        [CPU_VR4181A]   = "NEC VR4181A",
-       [CPU_SR71000]   = "Sandcraft SR71000"
+       [CPU_SR71000]   = "Sandcraft SR71000",
+       [CPU_PR4450]    = "Philips PR4450",
 };
 
 
@@ -119,16 +122,20 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                      cpu_has_divec ? "yes" : "no");
        seq_printf(m, "hardware watchpoint\t: %s\n",
                      cpu_has_watch ? "yes" : "no");
-       seq_printf(m, "ASEs implemented\t:%s%s%s%s\n",
+       seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
                      cpu_has_mips16 ? " mips16" : "",
                      cpu_has_mdmx ? " mdmx" : "",
                      cpu_has_mips3d ? " mips3d" : "",
-                     cpu_has_smartmips ? " smartmips" : "");
+                     cpu_has_smartmips ? " smartmips" : "",
+                     cpu_has_dsp ? " dsp" : "",
+                     cpu_has_mipsmt ? " mt" : ""
+               );
 
        sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
                cpu_has_vce ? "%u" : "not available");
        seq_printf(m, fmt, 'D', vced_count);
        seq_printf(m, fmt, 'I', vcei_count);
+       seq_printf(m, "\n");
 
        return 0;
 }