projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '4.0-fixes' into mips-for-linux-next
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
cpu-probe.c
diff --git
a/arch/mips/kernel/cpu-probe.c
b/arch/mips/kernel/cpu-probe.c
index
73ab840
..
e36515d
100644
(file)
--- 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;
}