Patched in Tegra support.

1 files changed, 22 insertions, 25 deletions

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 07dff54f2ce..e309665b6c8 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -25,7 +25,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         int i;
 
 #ifdef CONFIG_SMP
-        if (!cpu_online(n))
+        if (!cpu_isset(n, cpu_online_map))
                 return 0;
 #endif
 
@@ -41,48 +41,45 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 
         seq_printf(m, "processor\t\t: %ld\n", n);
         sprintf(fmt, "cpu model\t\t: %%s V%%d.%%d%s\n",
-                      cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
+                cpu_data[n].options & MIPS_CPU_FPU ? "  FPU V%d.%d" : "");
         seq_printf(m, fmt, __cpu_name[n],
-                      (version >> 4) & 0x0f, version & 0x0f,
-                      (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
+                                   (version >> 4) & 0x0f, version & 0x0f,
+                                   (fp_vers >> 4) & 0x0f, fp_vers & 0x0f);
         seq_printf(m, "BogoMIPS\t\t: %u.%02u\n",
-                      cpu_data[n].udelay_val / (500000/HZ),
-                      (cpu_data[n].udelay_val / (5000/HZ)) % 100);
+                      cpu_data[n].udelay_val / (500000/HZ),
+                      (cpu_data[n].udelay_val / (5000/HZ)) % 100);
         seq_printf(m, "wait instruction\t: %s\n", cpu_wait ? "yes" : "no");
         seq_printf(m, "microsecond timers\t: %s\n",
-                      cpu_has_counter ? "yes" : "no");
+                      cpu_has_counter ? "yes" : "no");
         seq_printf(m, "tlb_entries\t\t: %d\n", cpu_data[n].tlbsize);
         seq_printf(m, "extra interrupt vector\t: %s\n",
-                      cpu_has_divec ? "yes" : "no");
+                      cpu_has_divec ? "yes" : "no");
         seq_printf(m, "hardware watchpoint\t: %s",
-                      cpu_has_watch ? "yes, " : "no\n");
+                   cpu_has_watch ? "yes, " : "no\n");
         if (cpu_has_watch) {
                 seq_printf(m, "count: %d, address/irw mask: [",
-                      cpu_data[n].watch_reg_count);
+                           cpu_data[n].watch_reg_count);
                 for (i = 0; i < cpu_data[n].watch_reg_count; i++)
                         seq_printf(m, "%s0x%04x", i ? ", " : "" ,
-                                cpu_data[n].watch_reg_masks[i]);
+                                   cpu_data[n].watch_reg_masks[i]);
                 seq_printf(m, "]\n");
         }
-
-        seq_printf(m, "ASEs implemented\t:");
-        if (cpu_has_mips16)     seq_printf(m, "%s", " mips16");
-        if (cpu_has_mdmx)       seq_printf(m, "%s", " mdmx");
-        if (cpu_has_mips3d)     seq_printf(m, "%s", " mips3d");
-        if (cpu_has_smartmips)  seq_printf(m, "%s", " smartmips");
-        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");
-        seq_printf(m, "\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_dsp ? " dsp" : "",
+                      cpu_has_mipsmt ? " mt" : ""
+                );
         seq_printf(m, "shadow register sets\t: %d\n",
-                      cpu_data[n].srsets);
+                       cpu_data[n].srsets);
         seq_printf(m, "kscratch registers\t: %d\n",
-                      hweight8(cpu_data[n].kscratch_mask));
+                   hweight8(cpu_data[n].kscratch_mask));
         seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
 
         sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
-                      cpu_has_vce ? "%u" : "not available");
+                cpu_has_vce ? "%u" : "not available");
         seq_printf(m, fmt, 'D', vced_count);
         seq_printf(m, fmt, 'I', vcei_count);
         seq_printf(m, "\n");