diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 10:03:32 -0400 |
| commit | 3e20a26b02bd4f24945c87407df51948dd488620 (patch) | |
| tree | f466d3b2a47a98ec2910724e17ee2f3a93c1a49e /arch/mips/kernel/proc.c | |
| parent | 98b0429b7abd5c05efdb23f3eba02ec3f696748e (diff) | |
| parent | 5306a5450824691e27d68f711758515debedeeac (diff) | |
Merge branch '4.0-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/proc.c')
| -rw-r--r-- | arch/mips/kernel/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index 130af7d26a9c..298b2b773d12 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c | |||
| @@ -120,6 +120,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) | |||
| 120 | if (cpu_has_msa) seq_printf(m, "%s", " msa"); | 120 | if (cpu_has_msa) seq_printf(m, "%s", " msa"); |
| 121 | if (cpu_has_eva) seq_printf(m, "%s", " eva"); | 121 | if (cpu_has_eva) seq_printf(m, "%s", " eva"); |
| 122 | if (cpu_has_htw) seq_printf(m, "%s", " htw"); | 122 | if (cpu_has_htw) seq_printf(m, "%s", " htw"); |
| 123 | if (cpu_has_xpa) seq_printf(m, "%s", " xpa"); | ||
| 123 | seq_printf(m, "\n"); | 124 | seq_printf(m, "\n"); |
| 124 | 125 | ||
| 125 | if (cpu_has_mmips) { | 126 | if (cpu_has_mmips) { |