OSDN Git Service
(root)
/
uclinux-h8
/
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
[uclinux-h8/linux.git]
/
arch
/
mips
/
mm
/
tlb-r4k.c
diff --git
a/arch/mips/mm/tlb-r4k.c
b/arch/mips/mm/tlb-r4k.c
index
c2500f4
..
a27a088
100644
(file)
--- a/
arch/mips/mm/tlb-r4k.c
+++ b/
arch/mips/mm/tlb-r4k.c
@@
-489,7
+489,8
@@
static void r4k_tlb_configure(void)
write_c0_wired(0);
if (current_cpu_type() == CPU_R10000 ||
current_cpu_type() == CPU_R12000 ||
- current_cpu_type() == CPU_R14000)
+ current_cpu_type() == CPU_R14000 ||
+ current_cpu_type() == CPU_R16000)
write_c0_framemask(0);
if (cpu_has_rixi) {