diff options
author | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | Alfred Perlstein <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | 44956c9863dc03344b03bdf6a83acf4e743f8e50 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/random | |
parent | 1326e03f7f8018164ece91fc0a3f15f9c65ff64a (diff) | |
download | src-44956c9863dc03344b03bdf6a83acf4e743f8e50.tar.gz src-44956c9863dc03344b03bdf6a83acf4e743f8e50.zip |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Notes
Notes:
svn path=/head/; revision=109623
Diffstat (limited to 'sys/dev/random')
-rw-r--r-- | sys/dev/random/randomdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index d965cbc8d366..6256ae217d31 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -187,7 +187,7 @@ random_read(dev_t dev __unused, struct uio *uio, int flag) return error; } c = uio->uio_resid < PAGE_SIZE ? uio->uio_resid : PAGE_SIZE; - random_buf = (void *)malloc((u_long)c, M_TEMP, M_WAITOK); + random_buf = (void *)malloc((u_long)c, M_TEMP, 0); while (uio->uio_resid > 0 && error == 0) { ret = read_random_real(random_buf, c); error = uiomove(random_buf, ret, uio); @@ -205,7 +205,7 @@ random_write(dev_t dev __unused, struct uio *uio, int flag __unused) void *random_buf; error = 0; - random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK); + random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, 0); while (uio->uio_resid > 0) { c = (int)(uio->uio_resid < PAGE_SIZE ? uio->uio_resid |