diff options
| author | thorpej <thorpej@NetBSD.org> | 1999-06-17 18:21:21 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 1999-06-17 18:21:21 +0000 |
| commit | f5a527bb4e2a115e681edb2191dd90cfecbe8c78 (patch) | |
| tree | bcc93a38a9b6db06f8acbba7a6a54b336255d292 /sys | |
| parent | cc6eca7553ec49c6b03d2d65b668469bd4c918a3 (diff) | |
Remove pmap_pageable(); no pmap implements it, and it is not really useful,
because pmap_enter()/pmap_change_wiring() (soon to be pmap_unwire())
communicate the information in greater detail.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/alpha/alpha/pmap.c | 30 | ||||
| -rw-r--r-- | sys/arch/amiga/amiga/pmap.c | 72 | ||||
| -rw-r--r-- | sys/arch/arm32/arm32/pmap.c | 24 | ||||
| -rw-r--r-- | sys/arch/atari/atari/pmap.c | 72 | ||||
| -rw-r--r-- | sys/arch/hp300/hp300/pmap.c | 26 | ||||
| -rw-r--r-- | sys/arch/i386/i386/pmap.c | 21 | ||||
| -rw-r--r-- | sys/arch/mac68k/mac68k/pmap.c | 26 | ||||
| -rw-r--r-- | sys/arch/mips/mips/pmap.c | 32 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/pmap.c | 26 | ||||
| -rw-r--r-- | sys/arch/next68k/next68k/pmap.c | 29 | ||||
| -rw-r--r-- | sys/arch/pc532/pc532/pmap.c | 21 | ||||
| -rw-r--r-- | sys/arch/pica/pica/pmap.c | 30 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/pmap.c | 15 | ||||
| -rw-r--r-- | sys/arch/sparc/include/pmap.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/pmap.c | 21 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/pmap.c | 15 | ||||
| -rw-r--r-- | sys/arch/sun3/sun3/pmap.c | 25 | ||||
| -rw-r--r-- | sys/arch/sun3/sun3x/pmap.c | 22 | ||||
| -rw-r--r-- | sys/arch/vax/include/pmap.h | 3 | ||||
| -rw-r--r-- | sys/arch/x68k/x68k/pmap.c | 26 | ||||
| -rw-r--r-- | sys/uvm/uvm_fault.c | 18 | ||||
| -rw-r--r-- | sys/vm/pmap.h | 4 |
22 files changed, 25 insertions, 536 deletions
diff --git a/sys/arch/alpha/alpha/pmap.c b/sys/arch/alpha/alpha/pmap.c index 9bfc4ce121d..5be4b529ea8 100644 --- a/sys/arch/alpha/alpha/pmap.c +++ b/sys/arch/alpha/alpha/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.102 1999/05/31 20:49:00 ross Exp $ */ +/* $NetBSD: pmap.c,v 1.103 1999/06/17 18:21:24 thorpej Exp $ */ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -155,7 +155,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 1999/05/31 20:49:00 ross Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 1999/06/17 18:21:24 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2317,32 +2317,6 @@ pmap_copy_page(src, dst) } /* - * pmap_pageable: [ INTERFACE ] - * - * Make the specified pages (by pmap, offset) pageable (or not) as - * requested. - * - * A page which is not pageable may not take a fault; therefore, - * its page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter() will specify that - * these pages are to be wired down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif -} - -/* * pmap_clear_modify: [ INTERFACE ] * * Clear the modify bits on the specified physical page. diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c index 8190608e311..fdf14019e16 100644 --- a/sys/arch/amiga/amiga/pmap.c +++ b/sys/arch/amiga/amiga/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.65 1999/05/26 19:16:29 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.66 1999/06/17 18:21:27 thorpej Exp $ */ /* * Copyright (c) 1991 Regents of the University of California. @@ -2001,76 +2001,6 @@ pmap_copy_page(src, dst) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva, eva; - boolean_t pageable; -{ -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif - /* - * If we are making a PT page pageable then all valid - * mappings must be gone from that page. Hence it should - * be all zeros and there is no need to clean it. - * Assumptions: - * - we are called with only one page at a time - * - PT pages have only one pv_table entry - */ - if (pmap == pmap_kernel() && pageable && sva + PAGE_SIZE == eva) { - register pv_entry_t pv; - register vm_offset_t pa; - -#ifdef DEBUG - if ((pmapdebug & (PDB_FOLLOW|PDB_PTPAGE)) == PDB_PTPAGE) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif - if (!pmap_ste_v(pmap, sva)) - return; - pa = pmap_pte_pa(pmap_pte(pmap, sva)); - if (!PAGE_IS_MANAGED(pa)) - return; - pv = pa_to_pvh(pa); - if (pv->pv_ptste == NULL) - return; -#ifdef DEBUG - if (pv->pv_va != sva || pv->pv_next) { - printf("pmap_pageable: bad PT page va %lx next %p\n", - pv->pv_va, pv->pv_next); - return; - } -#endif - /* - * page is unused, free it now! - */ - pmap_remove(pv->pv_pmap, pv->pv_va, pv->pv_va + NBPG); - uvm_pagefree(PHYS_TO_VM_PAGE(pa)); -#ifdef DEBUG - if (pmapdebug & PDB_PTPAGE) - printf("pmap_pageable: PT page %lx(%x) freed\n", - sva, *(int *)pmap_pte(pmap, sva)); -#endif - } -} - -/* * Clear the modify bits on the specified physical page. */ diff --git a/sys/arch/arm32/arm32/pmap.c b/sys/arch/arm32/arm32/pmap.c index 14da56c5ea6..94cc9f2405c 100644 --- a/sys/arch/arm32/arm32/pmap.c +++ b/sys/arch/arm32/arm32/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.60 1999/04/11 04:04:06 chs Exp $ */ +/* $NetBSD: pmap.c,v 1.61 1999/06/17 18:21:28 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1311,28 +1311,6 @@ pmap_virtual_space(start, end) /* - * void pmap_pageable(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, - * boolean_t pageable) - * - * Make the specified pages (by pmap, offset) pageable (or not) as requested. - * - * A page which is not pageable may not take a fault; therefore, its - * page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter will specify that these - * pages are to be wired down (or not) as appropriate. - */ - -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva; - vm_offset_t eva; - boolean_t pageable; -{ -} - -/* * Activate the address space for the specified process. If the process * is the current process, load the new MMU context. */ diff --git a/sys/arch/atari/atari/pmap.c b/sys/arch/atari/atari/pmap.c index 094d03e3d46..789b79f6649 100644 --- a/sys/arch/atari/atari/pmap.c +++ b/sys/arch/atari/atari/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.46 1999/06/17 07:59:16 leo Exp $ */ +/* $NetBSD: pmap.c,v 1.47 1999/06/17 18:21:28 thorpej Exp $ */ /* * Copyright (c) 1991 Regents of the University of California. @@ -1722,76 +1722,6 @@ pmap_copy_page(src, dst) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif - /* - * If we are making a PT page pageable then all valid - * mappings must be gone from that page. Hence it should - * be all zeros and there is no need to clean it. - * Assumptions: - * - we are called with only one page at a time - * - PT pages have only one pv_table entry - */ - if (pmap == pmap_kernel() && pageable && sva + PAGE_SIZE == eva) { - register pv_entry_t pv; - register paddr_t pa; - -#ifdef DEBUG - if ((pmapdebug & (PDB_FOLLOW|PDB_PTPAGE)) == PDB_PTPAGE) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif - if (!pmap_ste_v(pmap, sva)) - return; - pa = pmap_pte_pa(pmap_pte(pmap, sva)); - if (!PAGE_IS_MANAGED(pa)) - return; - pv = pa_to_pvh(pa); - if (pv->pv_ptste == NULL) - return; -#ifdef DEBUG - if (pv->pv_va != sva || pv->pv_next) { - printf("pmap_pageable: bad PT page va %lx next %p\n", - pv->pv_va, pv->pv_next); - return; - } -#endif - /* - * page is unused, free it now! - */ - pmap_remove(pv->pv_pmap, pv->pv_va, pv->pv_va + NBPG); - uvm_pagefree(PHYS_TO_VM_PAGE(pa)); -#ifdef DEBUG - if (pmapdebug & PDB_PTPAGE) - printf("pmap_pageable: PT page %lx(%x) freed\n", - sva, *(int *)pmap_pte(pmap, sva)); -#endif - } -} - -/* * Clear the modify bits on the specified physical page. */ diff --git a/sys/arch/hp300/hp300/pmap.c b/sys/arch/hp300/hp300/pmap.c index 8443634b26c..53ea02d914f 100644 --- a/sys/arch/hp300/hp300/pmap.c +++ b/sys/arch/hp300/hp300/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.75 1999/06/15 22:18:07 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.76 1999/06/17 18:21:29 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1832,30 +1832,6 @@ pmap_copy_page(src, dst) } /* - * pmap_pageable: [ INTERFACE ] - * - * Make the specified pages (by pmap, offset) pageable (or not) as - * requested. - * - * A page which is not pageable may not take a fault; therefore, - * its page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter() will specify that - * these pages are to be wired down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - - PMAP_DPRINTF(PDB_FOLLOW, - ("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable)); -} - -/* * pmap_clear_modify: [ INTERFACE ] * * Clear the modify bits on the specified physical page. diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c index f62a3a4efac..801bb3eb978 100644 --- a/sys/arch/i386/i386/pmap.c +++ b/sys/arch/i386/i386/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.70 1999/06/17 00:12:11 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.71 1999/06/17 18:21:30 thorpej Exp $ */ /* * @@ -2991,25 +2991,6 @@ struct pmap *pmap; } /* - * pmap_pageable: set pageable status of a range of pages. - * could use this to ensure PTP is in place (but no need). - * - * => optional function. - */ - -void pmap_pageable(pmap, sva, eva, pageable) - -struct pmap *pmap; -vaddr_t sva, eva; -boolean_t pageable; - -{ - /* - * nothing useful for us to do here. - */ -} - -/* * pmap_transfer: transfer (move or copy) mapping from one pmap * to another. * diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c index c1de04ee843..34d10805672 100644 --- a/sys/arch/mac68k/mac68k/pmap.c +++ b/sys/arch/mac68k/mac68k/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.58 1999/06/15 22:18:08 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.59 1999/06/17 18:21:31 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1685,30 +1685,6 @@ pmap_copy_page(src, dst) } /* - * pmap_pageable: [ INTERFACE ] - * - * Make the specified pages (by pmap, offset) pageable (or not) as - * requested. - * - * A page which is not pageable may not take a fault; therefore, - * its page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter() will specify that - * these pages are to be wired down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - - PMAP_DPRINTF(PDB_FOLLOW, - ("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable)); -} - -/* * pmap_clear_modify: [ INTERFACE ] * * Clear the modify bits on the specified physical page. diff --git a/sys/arch/mips/mips/pmap.c b/sys/arch/mips/mips/pmap.c index afdfdd1104f..f6301fe3576 100644 --- a/sys/arch/mips/mips/pmap.c +++ b/sys/arch/mips/mips/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.66 1999/06/08 03:44:18 mhitch Exp $ */ +/* $NetBSD: pmap.c,v 1.67 1999/06/17 18:21:31 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.66 1999/06/08 03:44:18 mhitch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.67 1999/06/17 18:21:31 thorpej Exp $"); /* * Manages physical address maps. @@ -1662,34 +1662,6 @@ pmap_copy_page(src, dst) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable); -#endif -} - -/* * pmap_clear_reference: * * Clear the reference bit on the specified physical page. diff --git a/sys/arch/mvme68k/mvme68k/pmap.c b/sys/arch/mvme68k/mvme68k/pmap.c index 5b2d3a5f12c..ccb9a813147 100644 --- a/sys/arch/mvme68k/mvme68k/pmap.c +++ b/sys/arch/mvme68k/mvme68k/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.34 1999/06/15 22:18:09 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.35 1999/06/17 18:21:32 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1669,30 +1669,6 @@ pmap_copy_page(src, dst) } /* - * pmap_pageable: [ INTERFACE ] - * - * Make the specified pages (by pmap, offset) pageable (or not) as - * requested. - * - * A page which is not pageable may not take a fault; therefore, - * its page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter() will specify that - * these pages are to be wired down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - - PMAP_DPRINTF(PDB_FOLLOW, - ("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable)); -} - -/* * pmap_clear_modify: [ INTERFACE ] * * Clear the modify bits on the specified physical page. diff --git a/sys/arch/next68k/next68k/pmap.c b/sys/arch/next68k/next68k/pmap.c index 6be12386d80..fc4c6e4541f 100644 --- a/sys/arch/next68k/next68k/pmap.c +++ b/sys/arch/next68k/next68k/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.15 1999/06/15 22:18:09 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.16 1999/06/17 18:21:33 thorpej Exp $ */ /* * This file was taken from mvme68k/mvme68k/pmap.c @@ -1876,33 +1876,6 @@ pmap_copy_page(src, dst) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%p, %lx, %lx, %lx)\n", - pmap, sva, eva, pageable); -#endif -} - -/* * Clear the modify bits on the specified physical page. */ diff --git a/sys/arch/pc532/pc532/pmap.c b/sys/arch/pc532/pc532/pmap.c index ec41ee786c5..e2229ccad1c 100644 --- a/sys/arch/pc532/pc532/pmap.c +++ b/sys/arch/pc532/pc532/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.35 1999/06/17 00:22:42 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.36 1999/06/17 18:21:33 thorpej Exp $ */ /* * @@ -2716,25 +2716,6 @@ struct pmap *pmap; } /* - * pmap_pageable: set pageable status of a range of pages. - * could use this to ensure PTP is in place (but no need). - * - * => optional function. - */ - -void pmap_pageable(pmap, sva, eva, pageable) - -struct pmap *pmap; -vaddr_t sva, eva; -boolean_t pageable; - -{ - /* - * nothing useful for us to do here. - */ -} - -/* * pmap_transfer: transfer (move or copy) mapping from one pmap * to another. * diff --git a/sys/arch/pica/pica/pmap.c b/sys/arch/pica/pica/pmap.c index 4f2c647c0d9..1be62decef4 100644 --- a/sys/arch/pica/pica/pmap.c +++ b/sys/arch/pica/pica/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.8 1999/03/26 23:41:33 mycroft Exp $ */ +/* $NetBSD: pmap.c,v 1.9 1999/06/17 18:21:34 thorpej Exp $ */ /* * Copyright (c) 1992, 1993 @@ -1327,34 +1327,6 @@ pmap_copy_page(src, dst) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva, eva; - boolean_t pageable; -{ - -#ifdef DEBUG - if (pmapdebug & PDB_FOLLOW) - printf("pmap_pageable(%x, %x, %x, %x)\n", - pmap, sva, eva, pageable); -#endif -} - -/* * Clear the modify bits on the specified physical page. */ void diff --git a/sys/arch/powerpc/powerpc/pmap.c b/sys/arch/powerpc/powerpc/pmap.c index e8a242a2d07..d735dedb8a4 100644 --- a/sys/arch/powerpc/powerpc/pmap.c +++ b/sys/arch/powerpc/powerpc/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.21 1999/04/17 21:16:47 ws Exp $ */ +/* $NetBSD: pmap.c,v 1.22 1999/06/17 18:21:34 thorpej Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -709,19 +709,6 @@ pmap_collect(pm) } /* - * Make the specified pages pageable or not as requested. - * - * This routine is merely advisory. - */ -void -pmap_pageable(pm, start, end, pageable) - struct pmap *pm; - vaddr_t start, end; - int pageable; -{ -} - -/* * Fill the given physical page with zeroes. */ void diff --git a/sys/arch/sparc/include/pmap.h b/sys/arch/sparc/include/pmap.h index 2106abe095f..b367005e125 100644 --- a/sys/arch/sparc/include/pmap.h +++ b/sys/arch/sparc/include/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.36 1999/03/26 23:41:34 mycroft Exp $ */ +/* $NetBSD: pmap.h,v 1.37 1999/06/17 18:21:22 thorpej Exp $ */ /* * Copyright (c) 1996 @@ -252,7 +252,6 @@ pmap_t pmap_create __P((vsize_t)); void pmap_destroy __P((pmap_t)); void pmap_init __P((void)); vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, int)); -void pmap_pageable __P((pmap_t, vaddr_t, vaddr_t, boolean_t)); paddr_t pmap_phys_address __P((int)); void pmap_pinit __P((pmap_t)); void pmap_reference __P((pmap_t)); diff --git a/sys/arch/sparc/sparc/pmap.c b/sys/arch/sparc/sparc/pmap.c index ba2cc28760a..91b0e5f933f 100644 --- a/sys/arch/sparc/sparc/pmap.c +++ b/sys/arch/sparc/sparc/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.145 1999/05/20 10:03:12 pk Exp $ */ +/* $NetBSD: pmap.c,v 1.146 1999/06/17 18:21:34 thorpej Exp $ */ /* * Copyright (c) 1996 @@ -6351,25 +6351,6 @@ pmap_is_referenced4m(pa) #endif /* 4m */ /* - * Make the specified pages (by pmap, offset) pageable (or not) as requested. - * - * A page which is not pageable may not take a fault; therefore, its page - * table entry must remain valid for the duration (or at least, the trap - * handler must not call vm_fault). - * - * This routine is merely advisory; pmap_enter will specify that these pages - * are to be wired down (or not) as appropriate. - */ -/* ARGSUSED */ -void -pmap_pageable(pm, start, end, pageable) - struct pmap *pm; - vaddr_t start, end; - int pageable; -{ -} - -/* * Fill the given MI physical page with zero bytes. * * We avoid stomping on the cache. diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index 4a82f9e9f28..f42c8cd74e0 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.38 1999/06/07 05:28:04 eeh Exp $ */ +/* $NetBSD: pmap.c,v 1.39 1999/06/17 18:21:35 thorpej Exp $ */ /* #define NO_VCACHE */ /* Don't forget the locked TLB in dostart */ #define HWREF 1 /* #define BOOT_DEBUG */ @@ -1281,19 +1281,6 @@ pmap_collect(pm) #endif } -/* - * Make the specified pages pageable or not as requested. - * - * This routine is merely advisory. - */ -void -pmap_pageable(pm, start, end, pageable) - struct pmap *pm; - vaddr_t start, end; - int pageable; -{ -} - #if 0 /* * The two following routines are now in locore.s so I can code them in assembly diff --git a/sys/arch/sun3/sun3/pmap.c b/sys/arch/sun3/sun3/pmap.c index 0ec9b3ccefe..b7bd10b59c7 100644 --- a/sys/arch/sun3/sun3/pmap.c +++ b/sys/arch/sun3/sun3/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.111 1999/03/26 23:41:37 mycroft Exp $ */ +/* $NetBSD: pmap.c,v 1.112 1999/06/17 18:21:36 thorpej Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -2950,29 +2950,6 @@ pmap_page_protect(pa, prot) } /* - * Routine: pmap_pageable - * Function: - * Make the specified pages (by pmap, offset) - * pageable (or not) as requested. - * - * A page which is not pageable may not take - * a fault; therefore, its page table entry - * must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter - * will specify that these pages are to be wired - * down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vm_offset_t sva, eva; - boolean_t pageable; -{ - /* not implemented, hopefully not needed */ -} - -/* * Turn a cdevsw d_mmap value into a byte address for pmap_enter. * XXX this should almost certainly be done differently, and * elsewhere, or even not at all diff --git a/sys/arch/sun3/sun3x/pmap.c b/sys/arch/sun3/sun3x/pmap.c index 9117368f710..f0976d967b4 100644 --- a/sys/arch/sun3/sun3x/pmap.c +++ b/sys/arch/sun3/sun3x/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.45 1999/04/08 05:07:35 gwr Exp $ */ +/* $NetBSD: pmap.c,v 1.46 1999/06/17 18:21:37 thorpej Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -2409,26 +2409,6 @@ pmap_change_wiring(pmap, va, wire) } } -/* pmap_pageable INTERFACE - ** - * Make the specified range of addresses within the given pmap, - * 'pageable' or 'not-pageable'. A pageable page must not cause - * any faults when referenced. A non-pageable page may. - * - * This routine is only advisory. The VM system will call pmap_enter() - * to wire or unwire pages that are going to be made pageable before calling - * this function. By the time this routine is called, everything that needs - * to be done has already been done. - */ -void -pmap_pageable(pmap, start, end, pageable) - pmap_t pmap; - vm_offset_t start, end; - boolean_t pageable; -{ - /* not implemented. */ -} - /* pmap_copy INTERFACE ** * Copy the mappings of a range of addresses in one pmap, into diff --git a/sys/arch/vax/include/pmap.h b/sys/arch/vax/include/pmap.h index ee110c30551..70ccb75d55f 100644 --- a/sys/arch/vax/include/pmap.h +++ b/sys/arch/vax/include/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.33 1999/04/14 23:42:00 ragge Exp $ */ +/* $NetBSD: pmap.h,v 1.34 1999/06/17 18:21:22 thorpej Exp $ */ /* * Copyright (c) 1987 Carnegie-Mellon University @@ -110,7 +110,6 @@ 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_pageable(a,b,c,d) /* Dont do anything */ #define pmap_change_wiring(pmap, v, w) /* no need */ #define pmap_copy(a,b,c,d,e) /* Dont do anything */ #define pmap_update() mtpr(0,PR_TBIA) /* Update buffes */ diff --git a/sys/arch/x68k/x68k/pmap.c b/sys/arch/x68k/x68k/pmap.c index 2e41a91d581..02d3189f5d2 100644 --- a/sys/arch/x68k/x68k/pmap.c +++ b/sys/arch/x68k/x68k/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.38 1999/06/15 22:18:10 thorpej Exp $ */ +/* $NetBSD: pmap.c,v 1.39 1999/06/17 18:21:38 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -2052,30 +2052,6 @@ pmap_copy_page(src, dst) } /* - * pmap_pageable: [ INTERFACE ] - * - * Make the specified pages (by pmap, offset) pageable (or not) as - * requested. - * - * A page which is not pageable may not take a fault; therefore, - * its page table entry must remain valid for the duration. - * - * This routine is merely advisory; pmap_enter() will specify that - * these pages are to be wired down (or not) as appropriate. - */ -void -pmap_pageable(pmap, sva, eva, pageable) - pmap_t pmap; - vaddr_t sva, eva; - boolean_t pageable; -{ - - PMAP_DPRINTF(PDB_FOLLOW, - ("pmap_pageable(%p, %lx, %lx, %x)\n", - pmap, sva, eva, pageable)); -} - -/* * pmap_clear_modify: [ INTERFACE ] * * Clear the modify bits on the specified physical page. diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index 199fa0745cb..0a387143b76 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_fault.c,v 1.37 1999/06/16 23:02:40 thorpej Exp $ */ +/* $NetBSD: uvm_fault.c,v 1.38 1999/06/17 18:21:23 thorpej Exp $ */ /* * @@ -1727,14 +1727,7 @@ uvm_fault_wire(map, start, end, access_type) pmap = vm_map_pmap(map); /* - * call pmap pageable: this tells the pmap layer to lock down these - * page tables. - */ - - pmap_pageable(pmap, start, end, FALSE); - - /* - * now fault it in page at a time. if the fault fails then we have + * fault it in page at a time. if the fault fails then we have * to undo what we have done. */ @@ -1845,11 +1838,4 @@ uvm_fault_unwire_locked(map, start, end) } uvm_unlock_pageq(); - - /* - * now we call pmap_pageable to let the pmap know that the page tables - * in this space no longer need to be wired. - */ - - pmap_pageable(pmap, start, end, TRUE); } diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h index 0871cc7b656..faa2f97f540 100644 --- a/sys/vm/pmap.h +++ b/sys/vm/pmap.h @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.31 1999/05/20 23:25:42 thorpej Exp $ */ +/* $NetBSD: pmap.h,v 1.32 1999/06/17 18:21:21 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -172,8 +172,6 @@ void pmap_page_protect __P((struct vm_page *, vm_prot_t)); void pmap_page_protect __P((paddr_t, vm_prot_t)); #endif -void pmap_pageable __P((pmap_t, - vaddr_t, vaddr_t, boolean_t)); #if !defined(pmap_phys_address) paddr_t pmap_phys_address __P((int)); #endif |
