diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-15 21:07:06 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-15 21:07:06 +0000 |
| commit | b2910516abe27ac21394fe05cfbe8d5b208565be (patch) | |
| tree | 700e10e3a84a2eb92033e56383a12fb6032bfd91 | |
| parent | fab41b260ab8d55dae9aad19b9fb32654712b33b (diff) | |
Define PG_M_U as PG_M | PG_U, and use it where appropriate; no functional
change today, will become useful in the neat future.
| -rw-r--r-- | sys/arch/m88k/include/mmu.h | 3 | ||||
| -rw-r--r-- | sys/arch/m88k/m88k/pmap.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/arch/m88k/include/mmu.h b/sys/arch/m88k/include/mmu.h index 601f84ce81a..e44180047da 100644 --- a/sys/arch/m88k/include/mmu.h +++ b/sys/arch/m88k/include/mmu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mmu.h,v 1.3 2005/04/27 14:07:09 miod Exp $ */ +/* $OpenBSD: mmu.h,v 1.4 2005/09/15 21:07:04 miod Exp $ */ /* * This file bears almost no resemblance to the original m68k file, @@ -128,6 +128,7 @@ typedef u_int32_t pt_entry_t; #define PG_PROT 0x00000004 #define PG_U 0x00000008 #define PG_M 0x00000010 +#define PG_M_U 0x00000018 #define PG_RO 0x00000004 #define PG_RW 0x00000000 #define PG_SO 0x00000100 diff --git a/sys/arch/m88k/m88k/pmap.c b/sys/arch/m88k/m88k/pmap.c index 6c7d6a1638c..b61c8447ee2 100644 --- a/sys/arch/m88k/m88k/pmap.c +++ b/sys/arch/m88k/m88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.10 2005/09/06 19:21:57 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.11 2005/09/15 21:07:05 miod Exp $ */ /* * Copyright (c) 2001-2004, Miodrag Vallat * Copyright (c) 1998-2001 Steve Murphree, Jr. @@ -1117,7 +1117,7 @@ pmap_remove_pte(pmap_t pmap, vaddr_t va, pt_entry_t *pte) * Invalidate the pte. */ - opte = invalidate_pte(pte) & (PG_U | PG_M); + opte = invalidate_pte(pte) & PG_M_U; flush_atc_entry(users, va, kflush); pg = PHYS_TO_VM_PAGE(pa); @@ -1746,7 +1746,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) template |= CACHE_GLOBAL; if (flags & VM_PROT_WRITE) - template |= PG_U | PG_M; + template |= PG_M_U; else if (flags & VM_PROT_ALL) template |= PG_U; @@ -1755,7 +1755,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) * back the modified bit and/or the reference bit by * any other cpu. */ - template |= invalidate_pte(pte) & (PG_U | PG_M); + template |= invalidate_pte(pte) & PG_M_U; *pte = template | pa; flush_atc_entry(users, va, kflush); #ifdef DEBUG @@ -1767,7 +1767,7 @@ pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags) * Cache attribute flags */ if (pvl != NULL) - pvl->pv_flags |= (template & (PG_U | PG_M)); + pvl->pv_flags |= template & PG_M_U; PMAP_UNLOCK(pmap, spl); |