diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-09-28 16:25:52 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-09-28 16:25:52 +0200 |
| commit | 77a0d763c461da81c2a3fc9a7e58162a40854a1a (patch) | |
| tree | bc5ca1d08c8f9b98fd8c8726e88788d4fc618118 /arch/mips/kernel | |
| parent | 8922c9b4b2e3b1b845b46e8da61ad228d8f1b121 (diff) | |
| parent | 05857c64ecf897209c16ffad9bb3e8d359dd5dca (diff) | |
| download | blackbird-op-linux-77a0d763c461da81c2a3fc9a7e58162a40854a1a.tar.gz blackbird-op-linux-77a0d763c461da81c2a3fc9a7e58162a40854a1a.zip | |
Merge branch 'rixi-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 1b51046191e8..0beb75fb3980 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -421,8 +421,12 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c) config3 = read_c0_config3(); - if (config3 & MIPS_CONF3_SM) + if (config3 & MIPS_CONF3_SM) { c->ases |= MIPS_ASE_SMARTMIPS; + c->options |= MIPS_CPU_RIXI; + } + if (config3 & MIPS_CONF3_RXI) + c->options |= MIPS_CPU_RIXI; if (config3 & MIPS_CONF3_DSP) c->ases |= MIPS_ASE_DSP; if (config3 & MIPS_CONF3_VINT) |
