diff options
author | bde <bde@FreeBSD.org> | 1995-12-03 18:59:55 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-12-03 18:59:55 +0000 |
commit | 103688f7d6f2c0e8630923a5428f39896b7937bd (patch) | |
tree | af43b1b537cb19bd8516dfda50f8f66b853797e5 | |
parent | e8992ca8c12e621fe8cfaa9a147e4c11934060af (diff) | |
download | FreeBSD-src-103688f7d6f2c0e8630923a5428f39896b7937bd.zip FreeBSD-src-103688f7d6f2c0e8630923a5428f39896b7937bd.tar.gz |
Fixed the type mismatch in check for the bogus mmap function `nullop'.
The test should never succeed and should go away. Temporarily print
a warning if it does succeed.
-rw-r--r-- | sys/vm/device_pager.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 9fd69c8..a892c99 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)device_pager.c 8.1 (Berkeley) 6/11/93 - * $Id: device_pager.c,v 1.13 1995/11/06 00:36:19 bde Exp $ + * $Id: device_pager.c,v 1.14 1995/12/03 12:18:30 bde Exp $ */ #include <sys/param.h> @@ -94,8 +94,10 @@ dev_pager_alloc(handle, size, prot, foff) */ dev = (dev_t) (u_long) handle; mapfunc = cdevsw[major(dev)].d_mmap; - if (mapfunc == NULL || mapfunc == nullop) + if (mapfunc == NULL || mapfunc == (d_mmap_t *)nullop) { + printf("obsolete map function %p\n", (void *)mapfunc); return (NULL); + } /* * Offset should be page aligned. @@ -187,7 +189,7 @@ dev_pager_getpages(object, m, count, reqpage) prot = PROT_READ; /* XXX should pass in? */ mapfunc = cdevsw[major(dev)].d_mmap; - if (mapfunc == NULL || mapfunc == nullop) + if (mapfunc == NULL || mapfunc == (d_mmap_t *)nullop) panic("dev_pager_getpage: no map function"); paddr = pmap_phys_address((*mapfunc) ((dev_t) dev, (int) offset, prot)); |