summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2017-06-13 13:41:16 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2017-06-13 13:41:16 +0000
commit815c0b684db4661810102c75f9050d8a7fd86cbd (patch)
treefcb04f9a820c49241750c3ada2eb1630f1926d21 /sys/arch
parent77ef4677cba07025816f50379e956699e9d5d8e8 (diff)
Tweak order of operands to check constant `cache_valias_mask' first.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mips64/mips64/pmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arch/mips64/mips64/pmap.c b/sys/arch/mips64/mips64/pmap.c
index 16e59d35ecc..a6fe6f391e8 100644
--- a/sys/arch/mips64/mips64/pmap.c
+++ b/sys/arch/mips64/mips64/pmap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.c,v 1.103 2017/05/29 14:03:46 visa Exp $ */
+/* $OpenBSD: pmap.c,v 1.104 2017/06/13 13:41:15 visa Exp $ */
/*
* Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com)
@@ -1980,8 +1980,8 @@ pmap_remove_pv(pmap_t pmap, vaddr_t va, paddr_t pa)
}
}
- if ((pg->pg_flags & (PGF_CACHED | PGF_UNCACHED)) == 0 &&
- cache_valias_mask != 0 && pv->pv_pmap != NULL) {
+ if (cache_valias_mask != 0 && pv->pv_pmap != NULL &&
+ (pg->pg_flags & (PGF_CACHED | PGF_UNCACHED)) == 0) {
/*
* If this page had been mapped uncached due to aliasing,
* check if it can be mapped cached again after the current