d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finished (?) support for DISABLE_PSE option. 2-3MB of kernel vm was sometimes

Browse Source 
wasted.

Fixed type mismatches for functions with vm_prot_t's as args.  vm_prot_t
is u_char, so the prototypes should have used promoteof(u_char) to match
the old-style function definitions.  They use just vm_prot_t.  This depends
on gcc features to work.  I fixed the definitions since this is easiest.
The correct fix may be to change vm_prot_t to u_int, to optimize for time
instead of space.

Removed a stale comment.
This commit is contained in:
bde 1997-08-25 21:53:01 +00:00
parent 513dcef161
commit 7eca67951d
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/amd64/amd64/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.157 1997/08/07 03:52:50 dyson Exp $
* $Id: pmap.c,v 1.158 1997/08/07 05:15:48 dyson Exp $
*/
/*
@ -254,9 +254,11 @@ pmap_pte(pmap, va)
vm_offset_t
pmap_kmem_choose(vm_offset_t addr) {
vm_offset_t newaddr = addr;
#ifndef DISABLE_PSE
if (cpu_feature & CPUID_PSE) {
newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
}
#endif
return newaddr;
}
@ -1853,10 +1855,7 @@ pmap_remove_all(pa)
* specified range of this map as requested.
*/
void
pmap_protect(pmap, sva, eva, prot)
register pmap_t pmap;
vm_offset_t sva, eva;
vm_prot_t prot;
pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
{
register unsigned *ptbase;
vm_offset_t pdnxt;
@ -1949,12 +1948,8 @@ pmap_protect(pmap, sva, eva, prot)
* insert this page into the given map NOW.
*/
void
pmap_enter(pmap, va, pa, prot, wired)
register pmap_t pmap;
vm_offset_t va;
register vm_offset_t pa;
vm_prot_t prot;
boolean_t wired;
pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa, vm_prot_t prot,
boolean_t wired)
{
register unsigned *pte;
vm_offset_t opa;
@ -2896,9 +2891,7 @@ pmap_changebit(pa, bit, setem)
* Lower the permission for all mappings to a given page.
*/
void
pmap_page_protect(phys, prot)
vm_offset_t phys;
vm_prot_t prot;
pmap_page_protect(vm_offset_t phys, vm_prot_t prot)
{
if ((prot & VM_PROT_WRITE) == 0) {
if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
@ -3041,8 +3034,7 @@ i386_protection_init()
* Map a set of physical memory pages into the kernel virtual
* address space. Return a pointer to where it is mapped. This
* routine is intended to be used for mapping device memory,
* NOT real memory. The non-cacheable bits are set on each
* mapped page.
* NOT real memory.
*/
void *
pmap_mapdev(pa, size)

24
sys/i386/i386/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.157 1997/08/07 03:52:50 dyson Exp $
* $Id: pmap.c,v 1.158 1997/08/07 05:15:48 dyson Exp $
*/
/*
@ -254,9 +254,11 @@ pmap_pte(pmap, va)
vm_offset_t
pmap_kmem_choose(vm_offset_t addr) {
vm_offset_t newaddr = addr;
#ifndef DISABLE_PSE
if (cpu_feature & CPUID_PSE) {
newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
}
#endif
return newaddr;
}
@ -1853,10 +1855,7 @@ pmap_remove_all(pa)
* specified range of this map as requested.
*/
void
pmap_protect(pmap, sva, eva, prot)
register pmap_t pmap;
vm_offset_t sva, eva;
vm_prot_t prot;
pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
{
register unsigned *ptbase;
vm_offset_t pdnxt;
@ -1949,12 +1948,8 @@ pmap_protect(pmap, sva, eva, prot)
* insert this page into the given map NOW.
*/
void
pmap_enter(pmap, va, pa, prot, wired)
register pmap_t pmap;
vm_offset_t va;
register vm_offset_t pa;
vm_prot_t prot;
boolean_t wired;
pmap_enter(pmap_t pmap, vm_offset_t va, vm_offset_t pa, vm_prot_t prot,
boolean_t wired)
{
register unsigned *pte;
vm_offset_t opa;
@ -2896,9 +2891,7 @@ pmap_changebit(pa, bit, setem)
* Lower the permission for all mappings to a given page.
*/
void
pmap_page_protect(phys, prot)
vm_offset_t phys;
vm_prot_t prot;
pmap_page_protect(vm_offset_t phys, vm_prot_t prot)
{
if ((prot & VM_PROT_WRITE) == 0) {
if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) {
@ -3041,8 +3034,7 @@ i386_protection_init()
* Map a set of physical memory pages into the kernel virtual
* address space. Return a pointer to where it is mapped. This
* routine is intended to be used for mapping device memory,
* NOT real memory. The non-cacheable bits are set on each
* mapped page.
* NOT real memory.
*/
void *
pmap_mapdev(pa, size)