Page MenuHomeFreeBSD
Files F171430472

D8248.diff
No OneTemporary
Actions

D8248.diff
View Options

Index: sys/amd64/amd64/mem.c
===================================================================
--- sys/amd64/amd64/mem.c
+++ sys/amd64/amd64/mem.c
@@ -172,10 +172,9 @@
if (offset >= (1ULL << cpu_maxphyaddr))
return (-1);
*paddr = offset;
- } else if (dev2unit(dev) == CDEV_MINOR_KMEM)
- *paddr = vtophys(offset);
- /* else panic! */
- return (0);
+ return (0);
+ }
+ return (-1);
}
/*
Index: sys/arm/arm/mem.c
===================================================================
--- sys/arm/arm/mem.c
+++ sys/arm/arm/mem.c
@@ -161,10 +161,9 @@
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);
}
Index: sys/arm64/arm64/mem.c
===================================================================
--- sys/arm64/arm64/mem.c
+++ sys/arm64/arm64/mem.c
@@ -123,10 +123,9 @@
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);
}
Index: sys/i386/i386/mem.c
===================================================================
--- sys/i386/i386/mem.c
+++ sys/i386/i386/mem.c
@@ -161,12 +161,11 @@
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);
}
/*
Index: sys/powerpc/powerpc/mem.c
===================================================================
--- sys/powerpc/powerpc/mem.c
+++ sys/powerpc/powerpc/mem.c
@@ -179,8 +179,6 @@
if (dev2unit(dev) == CDEV_MINOR_MEM)
*paddr = offset;
- else if (dev2unit(dev) == CDEV_MINOR_KMEM)
- *paddr = vtophys(offset);
else
return (EFAULT);

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 12, 2:40 AM (1 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38754513
Default Alt Text
D8248.diff (2 KB)

Event Timeline