diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 06:51:33 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 06:51:33 -0500 |
| commit | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (patch) | |
| tree | 0ad091f645fbc8318634599d278966a53d3922ee /arch/mips/kernel/proc.c | |
| parent | 612663a974065c3445e641d046769fe4c55a6438 (diff) | |
| parent | 535237cecab2b078114be712c67e89a0db61965f (diff) | |
Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 79d4b8edbd76..135c4aadccbe 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -95,6 +95,8 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 95 | if (cpu_has_dsp) seq_printf(m, "%s", " dsp"); | 95 | if (cpu_has_dsp) seq_printf(m, "%s", " dsp"); |
| 96 | if (cpu_has_dsp2) seq_printf(m, "%s", " dsp2"); | 96 | if (cpu_has_dsp2) seq_printf(m, "%s", " dsp2"); |
| 97 | if (cpu_has_mipsmt) seq_printf(m, "%s", " mt"); | 97 | if (cpu_has_mipsmt) seq_printf(m, "%s", " mt"); |
| 98 | if (cpu_has_mmips) seq_printf(m, "%s", " micromips"); | ||
| 99 | if (cpu_has_vz) seq_printf(m, "%s", " vz"); | ||
| 98 | seq_printf(m, "\n"); | 100 | seq_printf(m, "\n"); |
| 99 | 101 | ||
| 100 | seq_printf(m, "shadow register sets\t: %d\n", | 102 | seq_printf(m, "shadow register sets\t: %d\n", |