summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/cpu-probe.c
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-09-11 08:30:19 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 07:45:07 +0100
commitd175ed2bd6544474dcc99d74f8155c2ba44e8db2 (patch)
treed4c3f724b8dbc6a0bf85216d0afe36bb23eed219 /arch/mips/kernel/cpu-probe.c
parentadac5d535d4e364324b92798bfb68336197e815e (diff)
downloadblackbird-obmc-linux-d175ed2bd6544474dcc99d74f8155c2ba44e8db2.tar.gz
blackbird-obmc-linux-d175ed2bd6544474dcc99d74f8155c2ba44e8db2.zip
MIPS: Ensure Config5.UFE is clear on boot
As is done for UFR, ensure that userland cannot directly manipulate the mode by clearing the UFE bit during boot. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/7677/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
-rw-r--r--arch/mips/kernel/cpu-probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index d76f189291bc..d68ad96392f8 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -461,7 +461,7 @@ static inline unsigned int decode_config5(struct cpuinfo_mips *c)
unsigned int config5;
config5 = read_c0_config5();
- config5 &= ~MIPS_CONF5_UFR;
+ config5 &= ~(MIPS_CONF5_UFR | MIPS_CONF5_UFE);
write_c0_config5(config5);
if (config5 & MIPS_CONF5_EVA)
OpenPOWER on IntegriCloud