diff options
| author | jdolecek <jdolecek@NetBSD.org> | 2018-10-14 17:37:40 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@NetBSD.org> | 2018-10-14 17:37:40 +0000 |
| commit | 1df1fda95b3fbbe5d2a49a1fcd1bfefbaeba6508 (patch) | |
| tree | d3b8a07267c11ccace1f91a11ac42924d928e87e | |
| parent | 27499c264f7ca51323ac65fa859a9287025ca4d4 (diff) | |
remove M_CANFAIL flag for malloc(9) - it was completely ignored, so had
actually no effect
| -rw-r--r-- | common/lib/libprop/prop_kern.c | 6 | ||||
| -rw-r--r-- | sys/arch/x86/x86/ipmi.c | 8 | ||||
| -rw-r--r-- | sys/dev/ata/TODO.ncq | 2 | ||||
| -rw-r--r-- | sys/dev/pci/mpii.c | 14 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sbt.c | 6 | ||||
| -rw-r--r-- | sys/dev/sdmmc/sdmmc_io.c | 9 | ||||
| -rw-r--r-- | sys/fs/udf/udf_allocation.c | 7 | ||||
| -rw-r--r-- | sys/fs/udf/udf_subr.c | 11 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 36 | ||||
| -rw-r--r-- | sys/miscfs/procfs/procfs_vnops.c | 8 | ||||
| -rw-r--r-- | sys/sys/malloc.h | 5 |
11 files changed, 50 insertions, 62 deletions
diff --git a/common/lib/libprop/prop_kern.c b/common/lib/libprop/prop_kern.c index cd09a669eb7..fa35842d336 100644 --- a/common/lib/libprop/prop_kern.c +++ b/common/lib/libprop/prop_kern.c @@ -1,4 +1,4 @@ -/* $NetBSD: prop_kern.c,v 1.23 2017/01/29 02:29:06 christos Exp $ */ +/* $NetBSD: prop_kern.c,v 1.24 2018/10/14 17:37:40 jdolecek Exp $ */ /*- * Copyright (c) 2006, 2009 The NetBSD Foundation, Inc. @@ -412,10 +412,8 @@ _prop_object_copyin(const struct plistref *pref, const prop_type_t type, /* * Allocate an extra byte so we can guarantee NUL-termination. - * - * Allow malloc to fail in case pmap would be exhausted. */ - buf = malloc(pref->pref_len + 1, M_TEMP, M_WAITOK | M_CANFAIL); + buf = malloc(pref->pref_len + 1, M_TEMP, M_WAITOK); if (buf == NULL) return (ENOMEM); error = copyin(pref->pref_plist, buf, pref->pref_len); diff --git a/sys/arch/x86/x86/ipmi.c b/sys/arch/x86/x86/ipmi.c index ce1ee81eadb..998a5f965b1 100644 --- a/sys/arch/x86/x86/ipmi.c +++ b/sys/arch/x86/x86/ipmi.c @@ -1,4 +1,4 @@ -/* $NetBSD: ipmi.c,v 1.66 2017/06/22 13:32:47 joerg Exp $ */ +/* $NetBSD: ipmi.c,v 1.67 2018/10/14 17:37:40 jdolecek Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.66 2017/06/22 13:32:47 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.67 2018/10/14 17:37:40 jdolecek Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -1204,7 +1204,7 @@ get_sdr(struct ipmi_softc *sc, uint16_t recid, uint16_t *nxtrec) /* Allocate space for entire SDR Length of SDR in header does not * include header length */ sdrlen = sizeof(shdr) + shdr.record_length; - psdr = malloc(sdrlen, M_DEVBUF, M_WAITOK|M_CANFAIL); + psdr = malloc(sdrlen, M_DEVBUF, M_WAITOK); if (psdr == NULL) return -1; @@ -1832,7 +1832,7 @@ add_child_sensors(struct ipmi_softc *sc, uint8_t *psdr, int count, sc->sc_nsensors += count; for (idx = 0; idx < count; idx++) { psensor = malloc(sizeof(struct ipmi_sensor), M_DEVBUF, - M_WAITOK|M_CANFAIL); + M_WAITOK); if (psensor == NULL) break; diff --git a/sys/dev/ata/TODO.ncq b/sys/dev/ata/TODO.ncq index dfd4a18a411..c6583b7551e 100644 --- a/sys/dev/ata/TODO.ncq +++ b/sys/dev/ata/TODO.ncq @@ -36,5 +36,3 @@ mvsata - move pci-specific code to the pci attach code mvsata(4) 64-bit DMA - at least with AHA1430SA does not really work, crash in mvsata_intr() on boot - -malloc(M_CANFAIL) actually doesn't do anything diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 02b874b4c0b..c16f1918235 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $NetBSD: mpii.c,v 1.11 2018/01/15 12:58:06 maya Exp $ */ +/* $NetBSD: mpii.c,v 1.12 2018/10/14 17:37:40 jdolecek Exp $ */ /* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */ /* * Copyright (c) 2010 Mike Belopuhov <mkb@crypt.org.ru> @@ -20,7 +20,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.11 2018/01/15 12:58:06 maya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.12 2018/10/14 17:37:40 jdolecek Exp $"); #include "bio.h" @@ -4905,7 +4905,7 @@ mpii_ioctl_cache(struct scsi_link *link, u_long cmd, struct dk_cache *dc) return (EINVAL); pagelen = hdr.page_length * 4; - vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO); + vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO); if (vpg == NULL) return (ENOMEM); @@ -5131,7 +5131,7 @@ mpii_ioctl_vol(struct mpii_softc *sc, struct bioc_vol *bv) } pagelen = hdr.page_length * 4; - vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO); + vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO); if (vpg == NULL) { printf("%s: unable to allocate space for raid " "volume page 0\n", DEVNAME(sc)); @@ -5236,7 +5236,7 @@ mpii_ioctl_disk(struct mpii_softc *sc, struct bioc_disk *bd) } pagelen = hdr.page_length * 4; - vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO); + vpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO); if (vpg == NULL) { printf("%s: unable to allocate space for raid " "volume page 0\n", DEVNAME(sc)); @@ -5293,7 +5293,7 @@ mpii_bio_hs(struct mpii_softc *sc, struct bioc_disk *bd, int nvdsk, } pagelen = le16toh(ehdr.ext_page_length) * 4; - cpg = malloc(pagelen, M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO); + cpg = malloc(pagelen, M_TEMP, M_WAITOK | M_ZERO); if (cpg == NULL) { printf("%s: unable to allocate space for raid config page 0\n", DEVNAME(sc)); @@ -5348,7 +5348,7 @@ mpii_bio_disk(struct mpii_softc *sc, struct bioc_disk *bd, u_int8_t dn) DNPRINTF(MPII_D_IOCTL, "%s: mpii_bio_disk %d\n", DEVNAME(sc), bd->bd_diskid); - ppg = malloc(sizeof(*ppg), M_TEMP, M_WAITOK | M_CANFAIL | M_ZERO); + ppg = malloc(sizeof(*ppg), M_TEMP, M_WAITOK | M_ZERO); if (ppg == NULL) { printf("%s: unable to allocate space for raid physical disk " "page 0\n", DEVNAME(sc)); diff --git a/sys/dev/sdmmc/sbt.c b/sys/dev/sdmmc/sbt.c index d20f39eb5cb..0879d7c79e6 100644 --- a/sys/dev/sdmmc/sbt.c +++ b/sys/dev/sdmmc/sbt.c @@ -1,4 +1,4 @@ -/* $NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $ */ +/* $NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $ */ /* $OpenBSD: sbt.c,v 1.9 2007/06/19 07:59:57 uwe Exp $ */ /* @@ -20,7 +20,7 @@ /* Driver for Type-A/B SDIO Bluetooth cards */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.6 2018/04/18 14:56:35 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbt.c,v 1.7 2018/10/14 17:37:40 jdolecek Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -182,7 +182,7 @@ sbt_attach(device_t parent, device_t self, void *aux) /* It may be Type-B, but we use it only in Type-A mode. */ printf("%s: SDIO Bluetooth Type-A\n", DEVNAME(sc)); - sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT | M_CANFAIL); + sc->sc_buf = malloc(SBT_PKT_BUFSIZ, M_DEVBUF, M_NOWAIT); if (sc->sc_buf == NULL) { aprint_error("%s: can't allocate cmd buffer\n", DEVNAME(sc)); return; diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c index 9f57eda6d12..160d9b09ff4 100644 --- a/sys/dev/sdmmc/sdmmc_io.c +++ b/sys/dev/sdmmc/sdmmc_io.c @@ -1,4 +1,4 @@ -/* $NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $ */ +/* $NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $ */ /* $OpenBSD: sdmmc_io.c,v 1.10 2007/09/17 01:33:33 krw Exp $ */ /* @@ -20,7 +20,7 @@ /* Routines for SD I/O cards. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.13 2017/10/23 13:47:17 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdmmc_io.c,v 1.14 2018/10/14 17:37:40 jdolecek Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -636,12 +636,11 @@ sdmmc_intr_establish(device_t dev, int (*fun)(void *), void *arg, if (sc->sc_sct->card_enable_intr == NULL) return NULL; - ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_CANFAIL|M_ZERO); + ih = malloc(sizeof *ih, M_DEVBUF, M_WAITOK|M_ZERO); if (ih == NULL) return NULL; - ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF, - M_WAITOK|M_CANFAIL|M_ZERO); + ih->ih_name = malloc(strlen(name) + 1, M_DEVBUF, M_WAITOK|M_ZERO); if (ih->ih_name == NULL) { free(ih, M_DEVBUF); return NULL; diff --git a/sys/fs/udf/udf_allocation.c b/sys/fs/udf/udf_allocation.c index 00ed8a08ffc..0a8ae737fd4 100644 --- a/sys/fs/udf/udf_allocation.c +++ b/sys/fs/udf/udf_allocation.c @@ -1,4 +1,4 @@ -/* $NetBSD: udf_allocation.c,v 1.39 2017/01/04 15:53:14 christos Exp $ */ +/* $NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -28,7 +28,7 @@ #include <sys/cdefs.h> #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.39 2017/01/04 15:53:14 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.40 2018/10/14 17:37:40 jdolecek Exp $"); #endif /* not lint */ @@ -1540,8 +1540,7 @@ udf_trunc_metadatapart(struct udf_mount *ump, uint32_t num_lb) *sizepos = udf_rw32(*sizepos) - to_trunc; /* realloc bitmap for better memory usage */ - new_sbd = realloc(sbd, inf_len, M_UDFVOLD, - M_CANFAIL | M_WAITOK); + new_sbd = realloc(sbd, inf_len, M_UDFVOLD, M_WAITOK); if (new_sbd) { /* update pointers */ ump->metadata_unalloc_dscr = new_sbd; diff --git a/sys/fs/udf/udf_subr.c b/sys/fs/udf/udf_subr.c index bb74218100f..407d8ee070a 100644 --- a/sys/fs/udf/udf_subr.c +++ b/sys/fs/udf/udf_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: udf_subr.c,v 1.143 2018/08/09 20:30:26 reinoud Exp $ */ +/* $NetBSD: udf_subr.c,v 1.144 2018/10/14 17:37:40 jdolecek Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -29,7 +29,7 @@ #include <sys/cdefs.h> #ifndef lint -__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.143 2018/08/09 20:30:26 reinoud Exp $"); +__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.144 2018/10/14 17:37:40 jdolecek Exp $"); #endif /* not lint */ @@ -1771,7 +1771,7 @@ udf_read_metadata_partition_spacetable(struct udf_mount *ump) "%"PRIu64" bytes\n", inflen)); /* allocate space for bitmap */ - dscr = malloc(inflen, M_UDFVOLD, M_CANFAIL | M_WAITOK); + dscr = malloc(inflen, M_UDFVOLD, M_WAITOK); if (!dscr) return ENOMEM; @@ -2739,7 +2739,7 @@ udf_vat_write(struct udf_node *vat_node, uint8_t *blob, int size, uint32_t offse /* realloc */ new_vat_table = realloc(ump->vat_table, ump->vat_table_alloc_len + UDF_VAT_CHUNKSIZE, - M_UDFVOLD, M_WAITOK | M_CANFAIL); + M_UDFVOLD, M_WAITOK); if (!new_vat_table) { printf("udf_vat_write: can't extent VAT, out of mem\n"); return ENOMEM; @@ -2936,8 +2936,7 @@ udf_check_for_vat(struct udf_node *vat_node) ((vat_length + UDF_VAT_CHUNKSIZE-1) / UDF_VAT_CHUNKSIZE) * UDF_VAT_CHUNKSIZE; - vat_table = malloc(vat_table_alloc_len, M_UDFVOLD, - M_CANFAIL | M_WAITOK); + vat_table = malloc(vat_table_alloc_len, M_UDFVOLD, M_WAITOK); if (vat_table == NULL) { printf("allocation of %d bytes failed for VAT\n", vat_table_alloc_len); diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 98e7185d803..a9df58fbbea 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $NetBSD: kern_sysctl.c,v 1.261 2018/01/27 00:00:26 christos Exp $ */ +/* $NetBSD: kern_sysctl.c,v 1.262 2018/10/14 17:37:40 jdolecek Exp $ */ /*- * Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.261 2018/01/27 00:00:26 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_sysctl.c,v 1.262 2018/10/14 17:37:40 jdolecek Exp $"); #ifdef _KERNEL_OPT #include "opt_defcorename.h" @@ -945,8 +945,7 @@ sysctl_create(SYSCTLFN_ARGS) * we want a rough idea of what the * size is now */ - vp = malloc(PAGE_SIZE, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + vp = malloc(PAGE_SIZE, M_SYSCTLDATA, M_WAITOK); if (vp == NULL) return (ENOMEM); e = nnode.sysctl_data; @@ -1015,8 +1014,7 @@ sysctl_create(SYSCTLFN_ARGS) if (type != CTLTYPE_NODE) { if (sz != 0) { if (flags & CTLFLAG_OWNDATA) { - own = malloc(sz, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + own = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (own == NULL) return ENOMEM; if (nnode.sysctl_data == NULL) @@ -1579,7 +1577,7 @@ sysctl_lookup(SYSCTLFN_ARGS) * temporary copy of new inbound string */ len = MIN(sz, newlen); - newbuf = malloc(len, M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + newbuf = malloc(len, M_SYSCTLDATA, M_WAITOK); if (newbuf == NULL) { DPRINTF(("%s: oomem %zu\n", __func__, len)); return ENOMEM; @@ -1709,7 +1707,7 @@ sysctl_describe(SYSCTLFN_ARGS) * get ready... */ error = 0; - d = bf = malloc(MAXDESCLEN, M_TEMP, M_WAITOK|M_CANFAIL); + d = bf = malloc(MAXDESCLEN, M_TEMP, M_WAITOK); if (bf == NULL) return ENOMEM; tot = 0; @@ -1807,8 +1805,7 @@ sysctl_describe(SYSCTLFN_ARGS) dnode.sysctl_flags & CTLFLAG_OWNDESC) { char *nd, *k; - k = malloc(MAXDESCLEN, M_TEMP, - M_WAITOK|M_CANFAIL); + k = malloc(MAXDESCLEN, M_TEMP, M_WAITOK); if (k == NULL) { error = ENOMEM; goto out; @@ -1819,8 +1816,7 @@ sysctl_describe(SYSCTLFN_ARGS) free(k, M_TEMP); goto out; } - nd = malloc(sz, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + nd = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (nd == NULL) { free(k, M_TEMP); error = ENOMEM; @@ -2153,7 +2149,7 @@ sysctl_createv(struct sysctllog **log, int cflags, else if (flags & CTLFLAG_OWNDESC) { size_t l = strlen(descr) + 1; char *d = malloc(l, M_SYSCTLDATA, - M_WAITOK|M_CANFAIL); + M_WAITOK); if (d != NULL) { memcpy(d, descr, l); dnode->sysctl_desc = d; @@ -2280,7 +2276,7 @@ sysctl_destroyv(struct sysctlnode *rnode, ...) char *d; sz = strlen(node->sysctl_desc) + 1; - d = malloc(sz, M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + d = malloc(sz, M_SYSCTLDATA, M_WAITOK); if (d != NULL) { /* * discard const so that we can @@ -2423,13 +2419,13 @@ sysctl_log_add(struct sysctllog **logp, const struct sysctlnode *node) if (*logp == NULL) { log = malloc(sizeof(struct sysctllog), - M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + M_SYSCTLDATA, M_WAITOK); if (log == NULL) { /* XXX print error message? */ return (-1); } log->log_num = malloc(size0 * sizeof(int), - M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + M_SYSCTLDATA, M_WAITOK); if (log->log_num == NULL) { /* XXX print error message? */ free(log, M_SYSCTLDATA); @@ -2659,10 +2655,10 @@ sysctl_alloc(struct sysctlnode *p, int x) if (x == 1) n = malloc(sizeof(struct sysctlnode), - M_SYSCTLNODE, M_WAITOK|M_CANFAIL); + M_SYSCTLNODE, M_WAITOK); else n = malloc(SYSCTL_DEFSIZE * sizeof(struct sysctlnode), - M_SYSCTLNODE, M_WAITOK|M_CANFAIL); + M_SYSCTLNODE, M_WAITOK); if (n == NULL) return (ENOMEM); @@ -2695,7 +2691,7 @@ sysctl_realloc(struct sysctlnode *p) */ olen = p->sysctl_clen; n = malloc(2 * olen * sizeof(struct sysctlnode), M_SYSCTLNODE, - M_WAITOK|M_CANFAIL); + M_WAITOK); if (n == NULL) return (ENOMEM); @@ -2736,7 +2732,7 @@ sysctl_log_realloc(struct sysctllog *log) s = log->log_size * 2; d = log->log_size; - n = malloc(s * sizeof(int), M_SYSCTLDATA, M_WAITOK|M_CANFAIL); + n = malloc(s * sizeof(int), M_SYSCTLDATA, M_WAITOK); if (n == NULL) return (-1); diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c index 663f9def5ec..93072440b2e 100644 --- a/sys/miscfs/procfs/procfs_vnops.c +++ b/sys/miscfs/procfs/procfs_vnops.c @@ -1,4 +1,4 @@ -/* $NetBSD: procfs_vnops.c,v 1.204 2018/09/03 16:29:35 riastradh Exp $ */ +/* $NetBSD: procfs_vnops.c,v 1.205 2018/10/14 17:37:40 jdolecek Exp $ */ /*- * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.204 2018/09/03 16:29:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: procfs_vnops.c,v 1.205 2018/10/14 17:37:40 jdolecek Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -664,7 +664,7 @@ procfs_getattr(void *v) /*FALLTHROUGH*/ case PFScwd: case PFSchroot: - path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK|M_CANFAIL); + path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK); if (path == NULL && procp != NULL) { procfs_proc_unlock(procp); return (ENOMEM); @@ -1629,7 +1629,7 @@ procfs_readlink(void *v) pfs->pfs_fileno == PROCFS_FILENO(pfs->pfs_pid, PFSchroot, -1)) { if ((error = procfs_proc_lock(pfs->pfs_pid, &pown, ESRCH)) != 0) return error; - path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK|M_CANFAIL); + path = malloc(MAXPATHLEN + 4, M_TEMP, M_WAITOK); if (path == NULL) { procfs_proc_unlock(pown); return (ENOMEM); diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 6ff926d8ada..0227cf6810b 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -1,4 +1,4 @@ -/* $NetBSD: malloc.h,v 1.116 2014/12/27 19:32:57 maxv Exp $ */ +/* $NetBSD: malloc.h,v 1.117 2018/10/14 17:37:40 jdolecek Exp $ */ /* * Copyright (c) 1987, 1993 @@ -42,8 +42,7 @@ #define M_WAITOK 0x0000 /* can wait for resources */ #define M_NOWAIT 0x0001 /* do not wait for resources */ #define M_ZERO 0x0002 /* zero the allocation */ -#define M_CANFAIL 0x0004 /* can fail if requested memory can't ever - * be allocated */ + #include <sys/mallocvar.h> #if 0 /* |
