diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:57:30 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-05-09 11:57:30 -0400 |
| commit | b22d1b6a91ca4260f869e349179ae53f18c664db (patch) | |
| tree | 6ac6c2bd202100727638f02ae5037ec78144e8d5 /arch/mips/kernel/proc.c | |
| parent | 5e0e61dd2c89c673f89fb57dcd3cc746dc0c1706 (diff) | |
| parent | 0ab2b7d08ea7226dc72ff0f8c05f470566facf7c (diff) | |
Merge branch 'mti-next' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 1dd137bab5c5..a3e461408b7e 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -99,6 +99,10 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 99 | if (cpu_has_vz) seq_printf(m, "%s", " vz"); | 99 | if (cpu_has_vz) seq_printf(m, "%s", " vz"); |
| 100 | seq_printf(m, "\n"); | 100 | seq_printf(m, "\n"); |
| 101 | 101 | ||
| 102 | if (cpu_has_mmips) { | ||
| 103 | seq_printf(m, "micromips kernel\t: %s\n", | ||
| 104 | (read_c0_config3() & MIPS_CONF3_ISA_OE) ? "yes" : "no"); | ||
| 105 | } | ||
| 102 | seq_printf(m, "shadow register sets\t: %d\n", | 106 | seq_printf(m, "shadow register sets\t: %d\n", |
| 103 | cpu_data[n].srsets); | 107 | cpu_data[n].srsets); |
| 104 | seq_printf(m, "kscratch registers\t: %d\n", | 108 | seq_printf(m, "kscratch registers\t: %d\n", |