diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/libkern | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/libkern')
| -rw-r--r-- | sys/libkern/iconv.c | 4 | ||||
| -rw-r--r-- | sys/libkern/iconv_xlat.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c index 8352fcd..8bc03c1 100644 --- a/sys/libkern/iconv.c +++ b/sys/libkern/iconv.c @@ -186,7 +186,7 @@ iconv_register_cspair(const char *to, const char *from, ucsfrom = strcmp(from, iconv_unicode_string) == 0; if (!ucsfrom) csize += strlen(from) + 1; - csp = malloc(csize, M_ICONV, 0); + csp = malloc(csize, M_ICONV, M_WAITOK); bzero(csp, csize); csp->cp_id = iconv_csid++; csp->cp_dcp = dcp; @@ -360,7 +360,7 @@ iconv_sysctl_add(SYSCTL_HANDLER_ARGS) if (error) return error; if (din.ia_datalen) { - csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, 0); + csp->cp_data = malloc(din.ia_datalen, M_ICONVDATA, M_WAITOK); error = copyin(din.ia_data, csp->cp_data, din.ia_datalen); if (error) goto bad; diff --git a/sys/libkern/iconv_xlat.c b/sys/libkern/iconv_xlat.c index e355c6b..6dd2800 100644 --- a/sys/libkern/iconv_xlat.c +++ b/sys/libkern/iconv_xlat.c @@ -62,7 +62,7 @@ iconv_xlat_open(struct iconv_converter_class *dcp, { struct iconv_xlat *dp; - dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, 0); + dp = (struct iconv_xlat *)kobj_create((struct kobj_class*)dcp, M_ICONV, M_WAITOK); dp->d_table = csp->cp_data; dp->d_csp = csp; csp->cp_refcount++; |
