diff options
author | rnoland <rnoland@FreeBSD.org> | 2009-12-29 21:51:28 +0000 |
---|---|---|
committer | rnoland <rnoland@FreeBSD.org> | 2009-12-29 21:51:28 +0000 |
commit | 3dc3ad8568aae78c6c3ebad44e859a0feac05c38 (patch) | |
tree | ffed01a3f1f97aa245caf60848edab318a53aef9 /sys/i386 | |
parent | b8a003ef1beea7446e2328791d40c81ee37e8bb0 (diff) | |
download | FreeBSD-src-3dc3ad8568aae78c6c3ebad44e859a0feac05c38.zip FreeBSD-src-3dc3ad8568aae78c6c3ebad44e859a0feac05c38.tar.gz |
Update d_mmap() to accept vm_ooffset_t and vm_memattr_t.
This replaces d_mmap() with the d_mmap2() implementation and also
changes the type of offset to vm_ooffset_t.
Purge d_mmap2().
All driver modules will need to be rebuilt since D_VERSION is also
bumped.
Reviewed by: jhb@
MFC after: Not in this lifetime...
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/i386/elan-mmcr.c | 3 | ||||
-rw-r--r-- | sys/i386/i386/mem.c | 4 | ||||
-rw-r--r-- | sys/i386/xbox/xboxfb.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c index 45f7c3a..b184237 100644 --- a/sys/i386/i386/elan-mmcr.c +++ b/sys/i386/i386/elan-mmcr.c @@ -416,7 +416,8 @@ elan_watchdog(void *foo __unused, u_int spec, int *error) } static int -elan_mmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int nprot) +elan_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, + int nprot, vm_memattr_t *memattr) { if (offset >= 0x1000) diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index b2deab2..11bfc37 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -163,8 +163,8 @@ memrw(struct cdev *dev, struct uio *uio, int flags) */ /* ARGSUSED */ int -memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, - int prot __unused) +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; diff --git a/sys/i386/xbox/xboxfb.c b/sys/i386/xbox/xboxfb.c index 906ced5..5d83d12 100644 --- a/sys/i386/xbox/xboxfb.c +++ b/sys/i386/xbox/xboxfb.c @@ -521,8 +521,8 @@ xboxfb_blank_display(video_adapter_t *adp, int mode) } static int -xboxfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) +xboxfb_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr, + int prot, vm_memattr_t *memattr) { return (EINVAL); } |