diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 16:03:32 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-04-13 16:03:32 +0200 |
| commit | 3e20a26b02bd4f24945c87407df51948dd488620 (patch) | |
| tree | f466d3b2a47a98ec2910724e17ee2f3a93c1a49e /arch/mips/kernel/cpu-probe.c | |
| parent | 98b0429b7abd5c05efdb23f3eba02ec3f696748e (diff) | |
| parent | 5306a5450824691e27d68f711758515debedeeac (diff) | |
| download | op-kernel-dev-3e20a26b02bd4f24945c87407df51948dd488620.zip op-kernel-dev-3e20a26b02bd4f24945c87407df51948dd488620.tar.gz | |
Merge branch '4.0-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 73ab840..e36515d 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -600,6 +600,10 @@ static inline unsigned int decode_config5(struct cpuinfo_mips *c) c->options |= MIPS_CPU_MAAR; if (config5 & MIPS_CONF5_LLB) c->options |= MIPS_CPU_RW_LLB; +#ifdef CONFIG_XPA + if (config5 & MIPS_CONF5_MVH) + c->options |= MIPS_CPU_XPA; +#endif return config5 & MIPS_CONF_M; } |
