diff options
author | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-28 15:34:18 +0000 |
---|---|---|
committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-11-28 15:34:18 +0000 |
commit | c838246d36eaa84d99978e74064e65cd79f105d2 (patch) | |
tree | 32aa458f7004dd4b1fff908d2f899d08344202a5 | |
parent | d8fc2211ac6dad4fe5c8f465ad7cfaee2ef87255 (diff) |
Make pmap_update functions into nops so that we can have a consistent
pmap_update API (right now it's nop).
-rw-r--r-- | sys/arch/alpha/alpha/pmap.c | 23 | ||||
-rw-r--r-- | sys/arch/alpha/include/pmap.h | 3 | ||||
-rw-r--r-- | sys/arch/amiga/amiga/pmap.c | 23 | ||||
-rw-r--r-- | sys/arch/amiga/include/pmap.h | 3 | ||||
-rw-r--r-- | sys/arch/mac68k/include/pmap.h | 3 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/bus_space.c | 4 | ||||
-rw-r--r-- | sys/arch/mac68k/mac68k/pmap.c | 18 | ||||
-rw-r--r-- | sys/arch/mvme68k/include/pmap.h | 3 | ||||
-rw-r--r-- | sys/arch/mvme68k/mvme68k/pmap.c | 23 | ||||
-rw-r--r-- | sys/arch/mvme88k/include/pmap.h | 4 | ||||
-rw-r--r-- | sys/arch/mvme88k/mvme88k/pmap.c | 36 | ||||
-rw-r--r-- | sys/arch/powerpc/include/pmap.h | 3 | ||||
-rw-r--r-- | sys/arch/powerpc/powerpc/pmap.c | 11 | ||||
-rw-r--r-- | sys/arch/sparc/include/pmap.h | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/pmap.c | 16 | ||||
-rw-r--r-- | sys/arch/sun3/include/pmap.h | 4 | ||||
-rw-r--r-- | sys/arch/sun3/sun3/pmap.c | 16 | ||||
-rw-r--r-- | sys/arch/vax/include/pmap.h | 4 |
18 files changed, 30 insertions, 171 deletions
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c index 97e80b548e1..0c51e69e507 100644 --- a/sys/arch/alpha/alpha/pmap.c +++ b/sys/arch/alpha/alpha/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.27 2001/11/28 14:20:16 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.28 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.c,v 1.154 2000/12/07 22:18:55 thorpej Exp $ */ /*- @@ -2221,27 +2221,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vaddr_t dst_addr, vsize_t len, } /* - * pmap_update: [ INTERFACE ] - * - * Require that all active physical maps contain no - * incorrect entries NOW, by processing any deferred - * pmap operations. - */ -void -pmap_update(void) -{ - -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_update()\n"); -#endif - - /* - * Nothing to do; this pmap module does not defer any operations. - */ -} - -/* * pmap_collect: [ INTERFACE ] * * Garbage collects the physical map system for pages which are no diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h index b4b6f195189..c47c85bc2d3 100644 --- a/sys/arch/alpha/include/pmap.h +++ b/sys/arch/alpha/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.9 2001/08/18 20:50:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.10 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */ /*- @@ -193,6 +193,7 @@ void pmap_tlb_shootdown_q_drain(u_long, boolean_t); #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) #define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count) +#define pmap_update() /* nothing */ extern pt_entry_t *VPT; /* Virtual Page Table */ diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c index c7560e13191..890721b785e 100644 --- a/sys/arch/amiga/amiga/pmap.c +++ b/sys/arch/amiga/amiga/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.40 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.41 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.c,v 1.68 1999/06/19 19:44:09 is Exp $ */ /*- @@ -1483,27 +1483,6 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) } /* - * Require that all active physical maps contain no - * incorrect entries NOW. [This update includes - * forcing updates of any address map caching.] - * - * Generally used to insure that a thread about - * to run will see a semantically correct world. - */ -void pmap_update() -{ -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_update()\n"); -#endif -#if defined(M68060) - if (machineid & AMIGA_68060) - DCIA(); -#endif - TBIA(); -} - -/* * Routine: pmap_collect * Function: * Garbage collects the physical map system for diff --git a/sys/arch/amiga/include/pmap.h b/sys/arch/amiga/include/pmap.h index 673fcd77623..b673d385e9d 100644 --- a/sys/arch/amiga/include/pmap.h +++ b/sys/arch/amiga/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.7 2001/08/18 20:50:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.8 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.h,v 1.17 1997/06/10 18:34:52 veego Exp $ */ /* @@ -135,6 +135,7 @@ struct pmap kernel_pmap_store; #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) #define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count) +#define pmap_update() /* nothing */ #endif /* _KERNEL */ diff --git a/sys/arch/mac68k/include/pmap.h b/sys/arch/mac68k/include/pmap.h index deaeabc8ab6..a97797e63ab 100644 --- a/sys/arch/mac68k/include/pmap.h +++ b/sys/arch/mac68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.10 2001/08/18 20:50:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.11 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.h,v 1.26 1999/07/21 03:18:21 briggs Exp $ */ /* @@ -181,6 +181,7 @@ extern struct pv_entry *pv_table; /* array of entries, one per page */ #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) #define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count) +#define pmap_update() /* nothing */ extern pt_entry_t *Sysmap; extern char *vmmap; /* map for mem, dumps, etc. */ diff --git a/sys/arch/mac68k/mac68k/bus_space.c b/sys/arch/mac68k/mac68k/bus_space.c index 26977323e48..3b6756354c4 100644 --- a/sys/arch/mac68k/mac68k/bus_space.c +++ b/sys/arch/mac68k/mac68k/bus_space.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_space.c,v 1.12 2001/11/06 19:53:15 miod Exp $ */ +/* $OpenBSD: bus_space.c,v 1.13 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: bus_space.c,v 1.5 1999/03/26 23:41:30 mycroft Exp $ */ /*- @@ -180,7 +180,7 @@ bus_mem_add_mapping(bpa, size, flags, bshp) *pte &= ~PG_CI; else *pte |= PG_CI; - pmap_update(); + TBIA(); } return 0; diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c index 4cf8fc71d4c..6ee13f34d0e 100644 --- a/sys/arch/mac68k/mac68k/pmap.c +++ b/sys/arch/mac68k/mac68k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.33 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.34 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.c,v 1.55 1999/04/22 04:24:53 chs Exp $ */ /* @@ -1365,22 +1365,6 @@ pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) } /* - * pmap_update: - * - * Require that all active physical maps contain no - * incorrect entires NOW, by processing any deferred - * pmap operations. - */ -void -pmap_update() -{ - - PMAP_DPRINTF(PDB_FOLLOW, ("pmap_update()\n")); - - TBIA(); /* XXX should not be here. */ -} - -/* * pmap_collect: [ INTERFACE ] * * Garbage collects the physical map system for pages which are no diff --git a/sys/arch/mvme68k/include/pmap.h b/sys/arch/mvme68k/include/pmap.h index e02b6740d74..95a17d2336f 100644 --- a/sys/arch/mvme68k/include/pmap.h +++ b/sys/arch/mvme68k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.6 2000/07/06 12:56:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.7 2001/11/28 15:34:16 art Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University @@ -149,6 +149,7 @@ extern struct pv_entry *pv_table; /* array of entries, one per page */ #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) #define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count) +#define pmap_update() /* nothing */ extern pt_entry_t *Sysmap; extern char *vmmap; /* map for mem, dumps, etc. */ diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c index 675bb53069b..d4742b91d2d 100644 --- a/sys/arch/mvme68k/mvme68k/pmap.c +++ b/sys/arch/mvme68k/mvme68k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.32 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.33 2001/11/28 15:34:16 art Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -1339,27 +1339,6 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) } /* - * Require that all active physical maps contain no - * incorrect entries NOW. [This update includes - * forcing updates of any address map caching.] - * - * Generally used to insure that a thread about - * to run will see a semantically correct world. - */ -void pmap_update() -{ -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_update()\n"); -#endif -#if defined(M68060) - if (mmutype == MMU_68060) - DCIA(); -#endif - TBIA(); -} - -/* * Routine: pmap_collect * Function: * Garbage collects the physical map system for diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 27197cb032a..b36f85a395c 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.17 2001/10/28 00:58:06 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.18 2001/11/28 15:34:16 art Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University @@ -75,6 +75,8 @@ extern caddr_t vmmap; /* Used in builtin/device_pager.c */ #define pmap_phys_address(frame) ((vm_offset_t) (ptoa(frame))) +#define pmap_update() /* nothing */ + #define PMAP_ACTIVATE(proc) pmap_activate(proc) #define PMAP_DEACTIVATE(proc) pmap_deactivate(proc) #define PMAP_CONTEXT(pmap, thread) diff --git a/sys/arch/mvme88k/mvme88k/pmap.c b/sys/arch/mvme88k/mvme88k/pmap.c index 0c16b59927f..0c6822e5e27 100644 --- a/sys/arch/mvme88k/mvme88k/pmap.c +++ b/sys/arch/mvme88k/mvme88k/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.47 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.48 2001/11/28 15:34:16 art Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -2909,40 +2909,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, }/* pmap_copy() */ - -/* - * Routine: PMAP_UPDATE - * - * Function: - * Require that all active physical maps contain no incorrect entries - * NOW. [This update includes forcing updates of any address map - * cashing] - * Generally used to ensure that thread about to run will see a - * semantically correct world. - * - * Parameters: - * none - * - * Call: - * cmmuflush - * - * The 88200 pmap implementation does not defer any operations. - * Therefore, the translation table trees are always consistent while the - * pmap lock is not held. Therefore, there is really no work to do in - * this function other than to flush the TLB. - */ -void -pmap_update(void) -{ -#ifdef DEBUG - if ((pmap_con_dbg & (CD_UPD | CD_FULL)) == (CD_UPD | CD_FULL)) - printf("(pmap_update :%x) Called \n", curproc); -#endif - -}/* pmap_update() */ - - - /* * Routine: PMAP_COLLECT * diff --git a/sys/arch/powerpc/include/pmap.h b/sys/arch/powerpc/include/pmap.h index 363f4524663..dd75475f6e4 100644 --- a/sys/arch/powerpc/include/pmap.h +++ b/sys/arch/powerpc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.21 2001/11/06 02:55:51 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.22 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.h,v 1.1 1996/09/30 16:34:29 ws Exp $ */ /*- @@ -94,6 +94,7 @@ int ptebits(paddr_t pa, int bit); #define pmap_is_referenced(page) (ptebits(VM_PAGE_TO_PHYS(page), PTE_REF)) #define pmap_unwire(pm, va) #define pmap_phys_address(x) (x) +#define pmap_update() /* nothing */ #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index fdab9983431..b3f505688cc 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.49 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.50 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.c,v 1.1 1996/09/30 16:34:52 ws Exp $ */ /* @@ -940,15 +940,6 @@ pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) } /* - * Require that all active physical maps contain no - * incorrect entries NOW. - */ -void -pmap_update() -{ -} - -/* * Garbage collects the physical map system for * pages which are no longer used. * Success need not be guaranteed -- that is, there diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index dc25d6b4aba..8528857e21d 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.24 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.25 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.h,v 1.30 1997/08/04 20:00:47 pk Exp $ */ /* @@ -295,7 +295,7 @@ void pmap_pinit __P((pmap_t)); void pmap_reference __P((pmap_t)); void pmap_release __P((pmap_t)); void pmap_remove __P((pmap_t, vaddr_t, vaddr_t)); -void pmap_update __P((void)); +#define pmap_update() /* nothing */ void pmap_init __P((void)); int pmap_page_index __P((paddr_t)); void pmap_virtual_space __P((vaddr_t *, vaddr_t *)); diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index f1de4924ff6..cad323178dd 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.99 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.100 2001/11/28 15:34:16 art Exp $ */ /* $NetBSD: pmap.c,v 1.118 1998/05/19 19:00:18 thorpej Exp $ */ /* @@ -5727,20 +5727,6 @@ pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr) } /* - * Require that all active physical maps contain no - * incorrect entries NOW. [This update includes - * forcing updates of any address map caching.] - */ -void -pmap_update() -{ -#if defined(SUN4M) - if (CPU_ISSUN4M) - tlb_flush_all(); /* %%%: Extreme Paranoia? */ -#endif -} - -/* * Garbage collects the physical map system for * pages which are no longer used. * Success need not be guaranteed -- that is, there diff --git a/sys/arch/sun3/include/pmap.h b/sys/arch/sun3/include/pmap.h index 55341d515c2..25fbee6dbed 100644 --- a/sys/arch/sun3/include/pmap.h +++ b/sys/arch/sun3/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.9 2001/08/18 20:50:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.10 2001/11/28 15:34:17 art Exp $ */ /* $NetBSD: pmap.h,v 1.18 1997/01/27 19:41:06 gwr Exp $ */ /*- @@ -70,6 +70,8 @@ extern void pmap_prefer(vm_offset_t, vm_offset_t *); extern segsz_t pmap_resident_pages(pmap_t); #define pmap_resident_count(pmap) pmap_resident_pages(pmap) +#define pmap_update() /* nothing */ + /* * Since PTEs also contain type bits, we have to have some way * to tell pmap_enter `this is an IO page' or `this is not to diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c index 2daa29ecbf0..ec8b438e322 100644 --- a/sys/arch/sun3/sun3/pmap.c +++ b/sys/arch/sun3/sun3/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.33 2001/11/28 14:13:06 art Exp $ */ +/* $OpenBSD: pmap.c,v 1.34 2001/11/28 15:34:17 art Exp $ */ /* $NetBSD: pmap.c,v 1.64 1996/11/20 18:57:35 gwr Exp $ */ /*- @@ -3120,20 +3120,6 @@ pmap_resident_pages(pmap) return (pages); } - -/* - * Require that all active physical maps contain no - * incorrect entries NOW. [This update includes - * forcing updates of any address map caching.] - * - * Generally used to insure that a thread about - * to run will see a semantically correct world. - */ -void -pmap_update() -{ -} - /* * pmap_copy_page copies the specified (machine independent) * page by mapping the page into virtual memory and using diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index b4f925200c4..2645763d069 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.13 2001/08/18 20:50:18 art Exp $ */ +/* $OpenBSD: pmap.h,v 1.14 2001/11/28 15:34:17 art Exp $ */ /* $NetBSD: pmap.h,v 1.37 1999/08/01 13:48:07 ragge Exp $ */ /* @@ -124,7 +124,7 @@ extern struct pmap kernel_pmap_store; /* Routines that are best to define as macros */ #define pmap_phys_address(phys) ((u_int)(phys) << PGSHIFT) #define pmap_copy(a,b,c,d,e) /* Dont do anything */ -#define pmap_update() mtpr(0,PR_TBIA) /* Update buffes */ +#define pmap_update() /* nothing */ #define pmap_collect(pmap) /* No need so far */ #define pmap_remove(pmap, start, slut) pmap_protect(pmap, start, slut, 0) #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) |