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

Brucify the pmap_enter_temporary() changes.

Browse Source
This commit is contained in:
Doug Rabson 2000-05-29 19:21:01 +00:00
parent b2f64c0141
commit 1536418a84
6 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/alpha/alpha/pmap.c
View File

@ -2205,10 +2205,10 @@ retry:
* Make temporary mapping for a physical address. This is called
* during dump.
*/
vm_offset_t
pmap_enter_temporary(vm_offset_t pa, vm_prot_t prot)
void *
pmap_kenter_temporary(vm_offset_t pa)
{
return ALPHA_PHYS_TO_K0SEG(pa);
return (void *) ALPHA_PHYS_TO_K0SEG(pa);
}
#define MAX_INIT_PT (96)

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

@ -2241,14 +2241,14 @@ retry:
}
/*
* Make temporary mapping for a physical address using CADDR1. This is
* called during dump.
* Make a temporary mapping for a physical address. This is only intended
* to be used for panic dumps.
*/
vm_offset_t
pmap_enter_temporary(vm_offset_t pa, vm_prot_t prot)
void *
pmap_kenter_temporary(vm_offset_t pa)
{
pmap_enter(kernel_pmap, (vm_offset_t) CADDR1, pa, prot, TRUE);
return (vm_offset_t) CADDR1;
pmap_kenter((vm_offset_t)CADDR1, pa);
return ((void *)CADDR1);
}
#define MAX_INIT_PT (96)

8
sys/cam/scsi/scsi_da.c
View File

@ -631,14 +631,12 @@ dadump(dev_t dev)
blkcnt = howmany(PAGE_SIZE, secsize);
while (num > 0) {
vm_offset_t va;
void *va;
if (is_physical_memory(addr)) {
va = pmap_enter_temporary(trunc_page(addr),
VM_PROT_READ);
va = pmap_kenter_temporary(trunc_page(addr));
} else {
va = pmap_enter_temporary(trunc_page(0),
VM_PROT_READ);
va = pmap_kenter_temporary(trunc_page(0));
}
xpt_setup_ccb(&csio.ccb_h, periph->path, /*priority*/1);

6
sys/dev/ata/ata-disk.c
View File

@ -272,12 +272,12 @@ addump(dev_t dev)
ata_reinit(adp->controller);
while (count > 0) {
vm_offset_t va;
void *va;
DELAY(1000);
if (is_physical_memory(addr))
va = pmap_enter_temporary(trunc_page(addr), VM_PROT_READ);
va = pmap_kenter_temporary(trunc_page(addr));
else
va = pmap_enter_temporary(trunc_page(0), VM_PROT_READ);
va = pmap_kenter_temporary(trunc_page(0));
bzero(&request, sizeof(struct ad_request));
request.device = adp;

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

@ -2241,14 +2241,14 @@ retry:
}
/*
* Make temporary mapping for a physical address using CADDR1. This is
* called during dump.
* Make a temporary mapping for a physical address. This is only intended
* to be used for panic dumps.
*/
vm_offset_t
pmap_enter_temporary(vm_offset_t pa, vm_prot_t prot)
void *
pmap_kenter_temporary(vm_offset_t pa)
{
pmap_enter(kernel_pmap, (vm_offset_t) CADDR1, pa, prot, TRUE);
return (vm_offset_t) CADDR1;
pmap_kenter((vm_offset_t)CADDR1, pa);
return ((void *)CADDR1);
}
#define MAX_INIT_PT (96)

2
sys/vm/pmap.h
View File

@ -140,7 +140,7 @@ void pmap_swapout_proc __P((struct proc *p));
void pmap_swapin_proc __P((struct proc *p));
void pmap_activate __P((struct proc *p));
vm_offset_t pmap_addr_hint __P((vm_object_t obj, vm_offset_t addr, vm_size_t size));
vm_offset_t pmap_enter_temporary __P((vm_offset_t pa, vm_prot_t prot));
void *pmap_kenter_temporary __P((vm_offset_t pa));
void pmap_init2 __P((void));
#endif /* _KERNEL */