diff options
| -rw-r--r-- | sys/amd64/amd64/mem.c | 7 | ||||
| -rw-r--r-- | sys/arm/arm/mem.c | 9 | ||||
| -rw-r--r-- | sys/arm64/arm64/mem.c | 9 | ||||
| -rw-r--r-- | sys/i386/i386/mem.c | 7 | ||||
| -rw-r--r-- | sys/mips/mips/mem.c | 6 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/mem.c | 2 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/mem.c | 2 |
7 files changed, 15 insertions, 27 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 7325664..c2e74ff 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -172,10 +172,9 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, if (offset > cpu_getmaxphyaddr()) return (-1); *paddr = offset; - } else if (dev2unit(dev) == CDEV_MINOR_KMEM) - *paddr = vtophys(offset); - /* else panic! */ - return (0); + return (0); + } + return (-1); } /* diff --git a/sys/arm/arm/mem.c b/sys/arm/arm/mem.c index 096988d..c2cf320 100644 --- a/sys/arm/arm/mem.c +++ b/sys/arm/arm/mem.c @@ -161,10 +161,9 @@ 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) + if (dev2unit(dev) == CDEV_MINOR_MEM) { *paddr = offset; - else if (dev2unit(dev) == CDEV_MINOR_KMEM) - *paddr = vtophys(offset); - /* else panic! */ - return (0); + return (0); + } + return (-1); } diff --git a/sys/arm64/arm64/mem.c b/sys/arm64/arm64/mem.c index 9044fb3..e0ea488 100644 --- a/sys/arm64/arm64/mem.c +++ b/sys/arm64/arm64/mem.c @@ -123,10 +123,9 @@ 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) + if (dev2unit(dev) == CDEV_MINOR_MEM) { *paddr = offset; - else if (dev2unit(dev) == CDEV_MINOR_KMEM) - *paddr = vtophys(offset); - /* else panic! */ - return (0); + return (0); + } + return (-1); } diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 003f207f..accd092 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -168,10 +168,9 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, if (offset > cpu_getmaxphyaddr()) return (-1); *paddr = offset; - } else if (dev2unit(dev) == CDEV_MINOR_KMEM) - *paddr = vtophys(offset); - /* else panic! */ - return (0); + return (0); + } + return (-1); } /* diff --git a/sys/mips/mips/mem.c b/sys/mips/mips/mem.c index 08bb6b0..30f4b34 100644 --- a/sys/mips/mips/mem.c +++ b/sys/mips/mips/mem.c @@ -151,12 +151,6 @@ int memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int prot, vm_memattr_t *memattr) { - /* - * /dev/mem is the only one that makes sense through this - * interface. For /dev/kmem any physaddr we return here - * could be transient and hence incorrect or invalid at - * a later time. - */ if (dev2unit(dev) != CDEV_MINOR_MEM) return (-1); diff --git a/sys/powerpc/powerpc/mem.c b/sys/powerpc/powerpc/mem.c index a7fbfa3..2bc89fd 100644 --- a/sys/powerpc/powerpc/mem.c +++ b/sys/powerpc/powerpc/mem.c @@ -179,8 +179,6 @@ memmmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, if (dev2unit(dev) == CDEV_MINOR_MEM) *paddr = offset; - else if (dev2unit(dev) == CDEV_MINOR_KMEM) - *paddr = vtophys(offset); else return (EFAULT); diff --git a/sys/sparc64/sparc64/mem.c b/sys/sparc64/sparc64/mem.c index 6bd5225..a25bef4 100644 --- a/sys/sparc64/sparc64/mem.c +++ b/sys/sparc64/sparc64/mem.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); /* * Memory special file * - * NOTE: other architectures support mmap()'ing the mem and kmem devices; this + * NOTE: other architectures support mmap()'ing the mem device; this * might cause illegal aliases to be created for the locked kernel page(s), so * it is not implemented. */ |
