MIPS: non-exec stack & heap when non-exec PT_GNU_STACK is present

[deliverable/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 5ac5c3e23460b72036ccd96d25296b7848841920..a88d44247cc898630f1b4ed62c92dacad44c43bd 100644 (file)
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -833,10 +833,8 @@ 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
+               c->options |= MIPS_CPU_MVH;
        if (cpu_has_mips_r6 && (config5 & MIPS_CONF5_VP))
                c->options |= MIPS_CPU_VP;