diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/dev/ofw | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/dev/ofw')
-rw-r--r-- | sys/dev/ofw/openfirm.c | 4 | ||||
-rw-r--r-- | sys/dev/ofw/openfirmio.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index 7704109..9ea97d3 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -292,7 +292,7 @@ OF_getprop(phandle_t package, char *propname, void *buf, int buflen) /* * Store the value of a property of a package into newly allocated memory (using - * the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a single element, + * the M_OFWPROP malloc pool and 0). elsz is the size of a single element, * the number of elements is return in number. */ int @@ -305,7 +305,7 @@ OF_getprop_alloc(phandle_t package, char *propname, int elsz, void **buf) len % elsz != 0) return (-1); - *buf = malloc(len, M_OFWPROP, M_WAITOK); + *buf = malloc(len, M_OFWPROP, 0); if (OF_getprop(package, propname, *buf, len) == -1) { free(*buf, M_OFWPROP); *buf = NULL; diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c index 6f40619..8bd5c04 100644 --- a/sys/dev/ofw/openfirmio.c +++ b/sys/dev/ofw/openfirmio.c @@ -115,7 +115,7 @@ openfirm_getstr(int len, const char *user, char **cpp) if ((u_int)len > OFW_NAME_MAX) return (ENAMETOOLONG); - *cpp = cp = malloc(len + 1, M_TEMP, M_WAITOK); + *cpp = cp = malloc(len + 1, M_TEMP, 0); if (cp == NULL) return (ENOMEM); error = copyin(user, cp, len); @@ -183,7 +183,7 @@ openfirm_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, /* -1 means no entry; 0 means no value */ if (len <= 0) break; - value = malloc(len, M_TEMP, M_WAITOK); + value = malloc(len, M_TEMP, 0); if (value == NULL) { error = ENOMEM; break; |