Index: stable/11/sys/arm64/arm64/mem.c
===================================================================
--- stable/11/sys/arm64/arm64/mem.c	(revision 305134)
+++ stable/11/sys/arm64/arm64/mem.c	(revision 305135)
@@ -1,116 +1,132 @@
 /*-
  * Copyright (c) 2014 Andrew Turner
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/uio.h>
 
 #include <machine/memdev.h>
 #include <machine/vmparam.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_page.h>
 
 struct mem_range_softc mem_range_softc;
 
 int
 memrw(struct cdev *dev, struct uio *uio, int flags)
 {
 	struct iovec *iov;
 	struct vm_page m;
 	vm_page_t marr;
 	vm_offset_t off, v;
 	u_int cnt;
 	int error;
 
 	error = 0;
 
 	while (uio->uio_resid > 0 && error == 0) {
 		iov = uio->uio_iov;
 		if (iov->iov_len == 0) {
 			uio->uio_iov++;
 			uio->uio_iovcnt--;
 			if (uio->uio_iovcnt < 0)
 				panic("memrw");
 			continue;
 		}
 
 		v = uio->uio_offset;
 		off = v & PAGE_MASK;
 		cnt = ulmin(iov->iov_len, PAGE_SIZE - (u_int)off);
 		if (cnt == 0)
 			continue;
 
 		switch(dev2unit(dev)) {
 		case CDEV_MINOR_KMEM:
 			/* If the address is in the DMAP just copy it */
 			if (VIRT_IN_DMAP(v)) {
 				error = uiomove((void *)v, cnt, uio);
 				break;
 			}
 
 			if (!kernacc((void *)v, cnt, uio->uio_rw == UIO_READ ?
 			    VM_PROT_READ : VM_PROT_WRITE)) {
 				error = EFAULT;
 				break;
 			}
 
 			/* Get the physical address to read */
 			v = pmap_extract(kernel_pmap, v);
 			if (v == 0) {
 				error = EFAULT;
 				break;
 			}
 
 			/* FALLTHROUGH */
 		case CDEV_MINOR_MEM:
 			/* If within the DMAP use this to copy from */
 			if (PHYS_IN_DMAP(v)) {
 				v = PHYS_TO_DMAP(v);
 				error = uiomove((void *)v, cnt, uio);
 				break;
 			}
 
 			/* Have uiomove_fromphys handle the data */
 			m.phys_addr = trunc_page(v);
 			marr = &m;
 			uiomove_fromphys(&marr, off, cnt, uio);
 			break;
 		}
 	}
 
 	return (error);
 }
 
+/*
+ * allow user processes to MMAP some memory sections
+ * instead of going through read/write
+ */
+/* ARGSUSED */
+int
+memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot __unused, vm_memattr_t *memattr __unused)
+{
+	if (dev2unit(dev) == CDEV_MINOR_MEM)
+		*paddr = offset;
+	else if (dev2unit(dev) == CDEV_MINOR_KMEM)
+		*paddr = vtophys(offset);
+	/* else panic! */
+	return (0);
+}
Index: stable/11/sys/arm64/include/memdev.h
===================================================================
--- stable/11/sys/arm64/include/memdev.h	(revision 305134)
+++ stable/11/sys/arm64/include/memdev.h	(revision 305135)
@@ -1,40 +1,40 @@
 /*-
  * Copyright (c) 2004 Mark R V Murray
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 
 #ifndef _MACHINE_MEMDEV_H_
 #define	_MACHINE_MEMDEV_H_
 
 #define	CDEV_MINOR_MEM	0
 #define	CDEV_MINOR_KMEM	1
 
 d_open_t	memopen;
 d_read_t	memrw;
 #define		memioctl	(d_ioctl_t *)NULL
-#define		memmmap		(d_mmap_t *)NULL
+d_mmap_t	memmmap;
 
 #endif /* _MACHINE_MEMDEV_H_ */
Index: stable/11
===================================================================
--- stable/11	(revision 305134)
+++ stable/11	(revision 305135)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r302789