--- xnu/xnu-12377.101.15/bsd/dev/random/randomdev.c
+++ xnu/xnu-6153.41.3/bsd/dev/random/randomdev.c
@@ -56,39 +56,26 @@
 
 d_ioctl_t       random_ioctl;
 
-static int
-random_stop(__unused struct tty *tp, __unused int rw)
-{
-	return 0;
-}
-
-static int
-random_reset(__unused int uban)
-{
-	return 0;
-}
-
-static int
-random_select(__unused dev_t dev, __unused int which, __unused void *wql,
-    __unused struct proc *p)
-{
-	return ENODEV;
-}
-
-static const struct cdevsw random_cdevsw =
-{
-	.d_open = random_open,
-	.d_close = random_close,
-	.d_read = random_read,
-	.d_write = random_write,
-	.d_ioctl = random_ioctl,
-	.d_stop = random_stop,
-	.d_reset = random_reset,
-	.d_select = random_select,
-	.d_mmap = eno_mmap,
-	.d_strategy = eno_strat,
-	.d_reserved_1 = eno_getc,
-	.d_reserved_2 = eno_putc,
+/*
+ * A struct describing which functions will get invoked for certain
+ * actions.
+ */
+static struct cdevsw random_cdevsw =
+{
+	random_open,            /* open */
+	random_close,           /* close */
+	random_read,            /* read */
+	random_write,           /* write */
+	random_ioctl,           /* ioctl */
+	(stop_fcn_t *)nulldev, /* stop */
+	(reset_fcn_t *)nulldev, /* reset */
+	NULL,                           /* tty's */
+	eno_select,                     /* select */
+	eno_mmap,                       /* mmap */
+	eno_strat,                      /* strategy */
+	eno_getc,                       /* getc */
+	eno_putc,                       /* putc */
+	0                                       /* type */
 };
 
 
@@ -107,14 +94,14 @@
 	}
 
 	devfs_make_node(makedev(ret, RANDOM_MINOR), DEVFS_CHAR,
-	    UID_ROOT, GID_WHEEL, 0666, "random");
+	    UID_ROOT, GID_WHEEL, 0666, "random", 0);
 
 	/*
 	 * also make urandom
 	 * (which is exactly the same thing in our context)
 	 */
 	devfs_make_node(makedev(ret, URANDOM_MINOR), DEVFS_CHAR,
-	    UID_ROOT, GID_WHEEL, 0666, "urandom");
+	    UID_ROOT, GID_WHEEL, 0666, "urandom", 0);
 }
 
 int
@@ -186,14 +173,15 @@
 
 	/* Security server is sending us entropy */
 
-	while ((size_t)uio_resid(uio) > 0 && retCode == 0) {
+	while (uio_resid(uio) > 0 && retCode == 0) {
 		/* get the user's data */
-		size_t bytesToInput = MIN((size_t)uio_resid(uio), sizeof(rdBuffer));
-		retCode = uiomove(rdBuffer, (int)bytesToInput, uio);
+		int bytesToInput = MIN(uio_resid(uio),
+		    (user_ssize_t) sizeof(rdBuffer));
+		retCode = uiomove(rdBuffer, bytesToInput, uio);
 		if (retCode != 0) {
 			break;
 		}
-		retCode = write_random(rdBuffer, (u_int)bytesToInput);
+		retCode = write_random(rdBuffer, bytesToInput);
 		if (retCode != 0) {
 			break;
 		}
@@ -211,17 +199,18 @@
 	int retCode = 0;
 	char buffer[512];
 
-	size_t bytes_remaining = (size_t)uio_resid(uio);
+	user_ssize_t bytes_remaining = uio_resid(uio);
 	while (bytes_remaining > 0 && retCode == 0) {
-		size_t bytesToRead = MIN(bytes_remaining, sizeof(buffer));
-		read_random(buffer, (u_int)bytesToRead);
-
-		retCode = uiomove(buffer, (int)bytesToRead, uio);
+		int bytesToRead = MIN(bytes_remaining,
+		    (user_ssize_t) sizeof(buffer));
+		read_random(buffer, bytesToRead);
+
+		retCode = uiomove(buffer, bytesToRead, uio);
 		if (retCode != 0) {
 			break;
 		}
 
-		bytes_remaining = (size_t)uio_resid(uio);
+		bytes_remaining = uio_resid(uio);
 	}
 
 	return retCode;
@@ -243,10 +232,10 @@
 getentropy(__unused struct proc * p, struct getentropy_args *gap, __unused int * ret)
 {
 	user_addr_t user_addr;
-	user_size_t user_size;
+	uint32_t user_size;
 	char buffer[256];
 
-	user_addr = (user_addr_t)gap->buffer;
+	user_addr = (vm_map_offset_t)gap->buffer;
 	user_size = gap->size;
 	/* Can't request more than 256 random bytes
 	 * at once. Complying with openbsd getentropy()
@@ -254,6 +243,6 @@
 	if (user_size > sizeof(buffer)) {
 		return EINVAL;
 	}
-	read_random(buffer, (u_int)user_size);
+	read_random(buffer, user_size);
 	return copyout(buffer, user_addr, user_size);
 }