xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / bsd / dev / mem.c

diff --git a/bsd/dev/mem.c b/bsd/dev/mem.c
index 758c358f64cc64a1042469883e22e37b47d1d57f..06a5c74320d37315d362f96b9d3ddfd7c5bc7339 100644 (file)
--- a/bsd/dev/mem.c
+++ b/bsd/dev/mem.c
@@ -154,7 +154,7 @@ mmioctl(dev_t dev, u_long cmd, __unused caddr_t data,
 int
 mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
 {
-       unsigned int c;
+       user_size_t c;
        int error = 0;
 
        while (uio_resid(uio) > 0) {
@@ -230,7 +230,7 @@ mmrw(dev_t dev, struct uio *uio, enum uio_rw rw)
                                break;
                        }
 
-                       c = min(uio_curriovlen(uio), PAGE_SIZE);
+                       c = MIN(uio_curriovlen(uio), PAGE_SIZE);
                        error = uiomove(devzerobuf, (int)c, uio);
                        if (error) {
                                break;