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

We don't need kcopy() in any of the remaining places it is used, so

Browse Source 
remove it.

MFC after:	2 weeks
This commit is contained in:
Nathan Whitehorn 2012-04-11 22:23:50 +00:00
parent b6aeb1ab97
commit e3c2930d36
4 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/powerpc/aim/machdep.c
View File

@ -738,36 +738,6 @@ spinlock_exit(void)
intr_restore(msr);
}
/*
* kcopy(const void *src, void *dst, size_t len);
*
* Copy len bytes from src to dst, aborting if we encounter a fatal
* page fault.
*
* kcopy() _must_ save and restore the old fault handler since it is
* called by uiomove(), which may be in the path of servicing a non-fatal
* page fault.
*/
int
kcopy(const void *src, void *dst, size_t len)
{
struct thread *td;
faultbuf env, *oldfault;
int rv;
td = curthread;
oldfault = td->td_pcb->pcb_onfault;
if ((rv = setfault(env)) != 0) {
td->td_pcb->pcb_onfault = oldfault;
return rv;
}
memcpy(dst, src, len);
td->td_pcb->pcb_onfault = oldfault;
return (0);
}
int db_trap_glue(struct trapframe *); /* Called from trap_subr.S */
int

2
sys/powerpc/aim/mmu_oea.c
View File

@ -1023,7 +1023,7 @@ moea_copy_page(mmu_t mmu, vm_page_t msrc, vm_page_t mdst)
dst = VM_PAGE_TO_PHYS(mdst);
src = VM_PAGE_TO_PHYS(msrc);
kcopy((void *)src, (void *)dst, PAGE_SIZE);
bcopy((void *)src, (void *)dst, PAGE_SIZE);
}
/*

4
sys/powerpc/aim/mmu_oea64.c
View File

@ -1097,14 +1097,14 @@ moea64_copy_page(mmu_t mmu, vm_page_t msrc, vm_page_t mdst)
src = VM_PAGE_TO_PHYS(msrc);
if (hw_direct_map) {
kcopy((void *)src, (void *)dst, PAGE_SIZE);
bcopy((void *)src, (void *)dst, PAGE_SIZE);
} else {
mtx_lock(&moea64_scratchpage_mtx);
moea64_set_scratchpage_pa(mmu, 0, src);
moea64_set_scratchpage_pa(mmu, 1, dst);
kcopy((void *)moea64_scratchpage_va[0],
bcopy((void *)moea64_scratchpage_va[0],
(void *)moea64_scratchpage_va[1], PAGE_SIZE);
mtx_unlock(&moea64_scratchpage_mtx);

1
sys/powerpc/include/cpu.h
View File

@ -100,6 +100,5 @@ void swi_vm(void *);
/* XXX the following should not be here. */
void savectx(struct pcb *);
int kcopy(const void *, void *, size_t);
#endif /* _MACHINE_CPU_H_ */