Not that vmmap is a much better name, but that's what we use on other
non-pmap-direct architectures.
ok?
Index: arch/arm64/arm64/mem.c
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/mem.c,v
retrieving revision 1.3
diff -u -p -r1.3 mem.c
--- arch/arm64/arm64/mem.c 14 Dec 2017 03:30:43 -0000 1.3
+++ arch/arm64/arm64/mem.c 17 Feb 2018 19:09:10 -0000
@@ -89,7 +89,6 @@
#include <uvm/uvm_extern.h>
-extern char *memhook; /* poor name! */
caddr_t zeropage;
/* open counter for aperture */
@@ -150,13 +149,13 @@ mmrw(dev_t dev, struct uio *uio, int fla
struct iovec *iov;
int error = 0;
vm_prot_t prot;
+ extern caddr_t vmmap;
if (minor(dev) == 0) {
/* lock against other uses of shared vmmap */
error = rw_enter(&physlock, RW_WRITE | RW_INTR);
if (error)
return (error);
-
}
while (uio->uio_resid > 0 && error == 0) {
iov = uio->uio_iov;
@@ -173,14 +172,14 @@ mmrw(dev_t dev, struct uio *uio, int fla
v = uio->uio_offset;
prot = uio->uio_rw == UIO_READ ? PROT_READ :
PROT_WRITE;
- pmap_enter(pmap_kernel(), (vaddr_t)memhook,
+ pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, prot|PMAP_WIRED);
pmap_update(pmap_kernel());
o = uio->uio_offset & PGOFSET;
c = ulmin(uio->uio_resid, PAGE_SIZE - o);
- error = uiomove((caddr_t)memhook + o, c, uio);
- pmap_remove(pmap_kernel(), (vaddr_t)memhook,
- (vaddr_t)memhook + PAGE_SIZE);
+ error = uiomove((caddr_t)vmmap + o, c, uio);
+ pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
+ (vaddr_t)vmmap + PAGE_SIZE);
pmap_update(pmap_kernel());
break;
Index: arch/arm64/arm64/pmap.c
===================================================================
RCS file: /cvs/src/sys/arch/arm64/arm64/pmap.c,v
retrieving revision 1.47
diff -u -p -r1.47 pmap.c
--- arch/arm64/arm64/pmap.c 31 Jan 2018 23:23:16 -0000 1.47
+++ arch/arm64/arm64/pmap.c 17 Feb 2018 19:09:10 -0000
@@ -139,7 +139,7 @@ vaddr_t pmap_map_stolen(vaddr_t);
void pmap_physload_avail(void);
extern caddr_t msgbufaddr;
-char *memhook;
+vaddr_t vmmap;
vaddr_t zero_page;
vaddr_t copy_src_page;
vaddr_t copy_dst_page;
@@ -1216,7 +1216,7 @@ pmap_bootstrap(long kvo, paddr_t lpt1, l
curcpu()->ci_curpm = pmap_kernel();
- memhook = (char *)vstart;
+ vmmap = vstart;
vstart += PAGE_SIZE;
return vstart;
