summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2014-04-03 13:14:05 +0200
committerRalf Baechle <ralf@linux-mips.org>2014-05-13 00:29:33 +0200
commit5508d456e9992bb81f21d4bd3b1f60f3eb04eb40 (patch)
treefb4cd7b1c07bb1bdf3ac1372fd8f9c86eaacf2eb /arch
parentd6d211db37e75de2ddc3a4f979038c40df7cc79c (diff)
downloadlinux-stable-5508d456e9992bb81f21d4bd3b1f60f3eb04eb40.tar.gz
linux-stable-5508d456e9992bb81f21d4bd3b1f60f3eb04eb40.tar.bz2
linux-stable-5508d456e9992bb81f21d4bd3b1f60f3eb04eb40.zip
Revert "MIPS: MT: proc: Add support for printing VPE and TC ids"
Reverts commit 795038a6910937fa167d47f6f6183db0eb8fb706 because d6d3c9afaab47418ab2d7f874fb8aeac1f067104 provides the same functionality in a more generic way. Both patches applied however means that the VPE and TC IDs get printed twice currently.
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/kernel/proc.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index e40971b51d2f..037a44d962f3 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -124,14 +124,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
seq_printf(m, "kscratch registers\t: %d\n",
hweight8(cpu_data[n].kscratch_mask));
seq_printf(m, "core\t\t\t: %d\n", cpu_data[n].core);
-#if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)
- if (cpu_has_mipsmt) {
- seq_printf(m, "VPE\t\t\t: %d\n", cpu_data[n].vpe_id);
-#if defined(CONFIG_MIPS_MT_SMTC)
- seq_printf(m, "TC\t\t\t: %d\n", cpu_data[n].tc_id);
-#endif
- }
-#endif
+
sprintf(fmt, "VCE%%c exceptions\t\t: %s\n",
cpu_has_vce ? "%u" : "not available");
seq_printf(m, fmt, 'D', vced_count);