summaryrefslogtreecommitdiffstats
path: root/sys/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/i386/bios.c2
-rw-r--r--sys/i386/i386/busdma_machdep.c4
-rw-r--r--sys/i386/i386/elan-mmcr.c2
-rw-r--r--sys/i386/i386/i686_mem.c2
-rw-r--r--sys/i386/i386/mem.c4
-rw-r--r--sys/i386/i386/mp_machdep.c8
-rw-r--r--sys/i386/i386/mptable.c8
-rw-r--r--sys/i386/i386/sys_machdep.c2
-rw-r--r--sys/i386/i386/vm86.c2
-rw-r--r--sys/i386/ibcs2/ibcs2_misc.c4
-rw-r--r--sys/i386/ibcs2/ibcs2_util.c2
-rw-r--r--sys/i386/ibcs2/imgact_coff.c2
-rw-r--r--sys/i386/include/mptable.h8
-rw-r--r--sys/i386/isa/ctx.c2
-rw-r--r--sys/i386/isa/gpib.c2
-rw-r--r--sys/i386/isa/if_cx.c8
-rw-r--r--sys/i386/isa/if_el.c6
-rw-r--r--sys/i386/isa/if_le.c6
-rw-r--r--sys/i386/isa/if_rdp.c4
-rw-r--r--sys/i386/isa/loran.c2
-rw-r--r--sys/i386/isa/pcvt/pcvt_kbd.c2
-rw-r--r--sys/i386/isa/pcvt/pcvt_out.c2
-rw-r--r--sys/i386/isa/pcvt/pcvt_sup.c2
-rw-r--r--sys/i386/isa/spkr.c2
-rw-r--r--sys/i386/isa/vesa.c6
-rw-r--r--sys/i386/isa/wt.c2
-rw-r--r--sys/i386/linux/linux_sysvec.c2
27 files changed, 49 insertions, 49 deletions
diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c
index 747a3a1..ae14099 100644
--- a/sys/i386/i386/bios.c
+++ b/sys/i386/i386/bios.c
@@ -388,7 +388,7 @@ bios16(struct bios_args *args, char *fmt, ...)
/*
* no page table, so create one and install it.
*/
- pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+ pte = (pt_entry_t *)malloc(PAGE_SIZE, M_TEMP, 0);
ptd = (pd_entry_t *)((u_int)ptd + KERNBASE);
*ptd = vtophys(pte) | PG_RW | PG_V;
} else {
diff --git a/sys/i386/i386/busdma_machdep.c b/sys/i386/i386/busdma_machdep.c
index 3158726..eb6cc9d 100644
--- a/sys/i386/i386/busdma_machdep.c
+++ b/sys/i386/i386/busdma_machdep.c
@@ -339,7 +339,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
if ((dmat->maxsize <= PAGE_SIZE) && dmat->lowaddr >= ptoa(Maxmem)) {
*vaddr = malloc(dmat->maxsize, M_DEVBUF,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK);
+ (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0);
} else {
/*
* XXX Use Contigmalloc until it is merged into this facility
@@ -347,7 +347,7 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
* multi-seg allocations yet though.
*/
*vaddr = contigmalloc(dmat->maxsize, M_DEVBUF,
- (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK,
+ (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : 0,
0ul, dmat->lowaddr, dmat->alignment? dmat->alignment : 1ul,
dmat->boundary);
}
diff --git a/sys/i386/i386/elan-mmcr.c b/sys/i386/i386/elan-mmcr.c
index 7ddd90c..ca64768 100644
--- a/sys/i386/i386/elan-mmcr.c
+++ b/sys/i386/i386/elan-mmcr.c
@@ -286,7 +286,7 @@ elan_write(dev_t dev, struct uio *uio, int ioflag)
if (uio->uio_resid > 512)
return (EINVAL);
- s = malloc(uio->uio_resid + 1, M_DEVBUF, M_WAITOK);
+ s = malloc(uio->uio_resid + 1, M_DEVBUF, 0);
if (s == NULL)
return (ENOMEM);
untimeout(timeout_errled, NULL, errled_h);
diff --git a/sys/i386/i386/i686_mem.c b/sys/i386/i386/i686_mem.c
index 589fc64..f3fc4e8 100644
--- a/sys/i386/i386/i686_mem.c
+++ b/sys/i386/i386/i686_mem.c
@@ -557,7 +557,7 @@ i686_mrinit(struct mem_range_softc *sc)
sc->mr_desc =
(struct mem_range_desc *)malloc(nmdesc * sizeof(struct mem_range_desc),
- M_MEMDESC, M_WAITOK | M_ZERO);
+ M_MEMDESC, M_ZERO);
sc->mr_ndesc = nmdesc;
mrd = sc->mr_desc;
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c
index 41fa636..4905d3c 100644
--- a/sys/i386/i386/mem.c
+++ b/sys/i386/i386/mem.c
@@ -265,7 +265,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
if (nd > 0) {
md = (struct mem_range_desc *)
malloc(nd * sizeof(struct mem_range_desc),
- M_MEMDESC, M_WAITOK);
+ M_MEMDESC, 0);
error = mem_range_attr_get(md, &nd);
if (!error)
error = copyout(md, mo->mo_desc,
@@ -279,7 +279,7 @@ mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
case MEMRANGE_SET:
md = (struct mem_range_desc *)malloc(sizeof(struct mem_range_desc),
- M_MEMDESC, M_WAITOK);
+ M_MEMDESC, 0);
error = copyin(mo->mo_desc, md, sizeof(struct mem_range_desc));
/* clamp description string */
md->mr_owner[sizeof(md->mr_owner) - 1] = 0;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index 00da6fa..9b24c6f 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
pgeflag = 0; /* XXX - Not used under SMP yet. */
MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index 00da6fa..9b24c6f 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -919,13 +919,13 @@ mptable_pass2(void)
pgeflag = 0; /* XXX - Not used under SMP yet. */
MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index e1347da..4d98979 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -298,7 +298,7 @@ user_ldt_alloc(struct mdproc *mdp, int len)
mtx_unlock_spin(&sched_lock);
mtx_assert(&sched_lock, MA_NOTOWNED);
MALLOC(new_ldt, struct proc_ldt *, sizeof(struct proc_ldt),
- M_SUBPROC, M_WAITOK);
+ M_SUBPROC, 0);
new_ldt->ldt_len = len = NEW_MAX_LD(len);
new_ldt->ldt_base = (caddr_t)kmem_alloc(kernel_map,
diff --git a/sys/i386/i386/vm86.c b/sys/i386/i386/vm86.c
index dd7624f..6126dda 100644
--- a/sys/i386/i386/vm86.c
+++ b/sys/i386/i386/vm86.c
@@ -490,7 +490,7 @@ vm86_addpage(struct vm86context *vmc, int pagenum, vm_offset_t kva)
goto full; /* XXX grow map? */
if (kva == 0) {
- kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+ kva = (vm_offset_t)malloc(PAGE_SIZE, M_TEMP, 0);
flags = VMAP_MALLOC;
}
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 295be86..abebf2a 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -333,7 +333,7 @@ ibcs2_getdents(td, uap)
#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */
buflen = max(DIRBLKSIZ, uap->nbytes);
buflen = min(buflen, MAXBSIZE);
- buf = malloc(buflen, M_TEMP, M_WAITOK);
+ buf = malloc(buflen, M_TEMP, 0);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
again:
aiov.iov_base = buf;
@@ -494,7 +494,7 @@ ibcs2_read(td, uap)
buflen = max(DIRBLKSIZ, uap->nbytes);
buflen = min(buflen, MAXBSIZE);
- buf = malloc(buflen, M_TEMP, M_WAITOK);
+ buf = malloc(buflen, M_TEMP, 0);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
again:
aiov.iov_base = buf;
diff --git a/sys/i386/ibcs2/ibcs2_util.c b/sys/i386/ibcs2/ibcs2_util.c
index 2172433..55ff6ab 100644
--- a/sys/i386/ibcs2/ibcs2_util.c
+++ b/sys/i386/ibcs2/ibcs2_util.c
@@ -66,7 +66,7 @@ ibcs2_emul_find(td, sgp, prefix, path, pbuf, cflag)
char *ptr, *buf, *cp;
size_t sz, len;
- buf = (char *) malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
+ buf = (char *) malloc(MAXPATHLEN, M_TEMP, 0);
*pbuf = path;
for (ptr = buf; (*ptr = *prefix) != '\0'; ptr++, prefix++)
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index fb5f537..b19cb56 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -386,7 +386,7 @@ exec_coff_imgact(imgp)
int emul_path_len = strlen(ibcs2_emul_path);
libbuf = malloc(MAXPATHLEN + emul_path_len,
- M_TEMP, M_WAITOK);
+ M_TEMP, 0);
strcpy(libbuf, ibcs2_emul_path);
for (j = off; j < scns[i].s_size + off;) {
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index 00da6fa..9b24c6f 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -919,13 +919,13 @@ mptable_pass2(void)
pgeflag = 0; /* XXX - Not used under SMP yet. */
MALLOC(io_apic_versions, u_int32_t *, sizeof(u_int32_t) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(ioapic, volatile ioapic_t **, sizeof(ioapic_t *) * mp_napics,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(io_apic_ints, io_int *, sizeof(io_int) * (nintrs + 1),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
MALLOC(bus_data, bus_datum *, sizeof(bus_datum) * mp_nbusses,
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
bzero(ioapic, sizeof(ioapic_t *) * mp_napics);
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index e70c40e..6b5a2ca 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -234,7 +234,7 @@ ctxopen(dev_t dev, int flags, int fmt, struct thread *td)
/* get space for the LUT buffer */
- sr->lutp = malloc(LUTSIZE, M_DEVBUF, M_WAITOK);
+ sr->lutp = malloc(LUTSIZE, M_DEVBUF, 0);
if (sr->lutp == NULL)
return (ENOMEM);
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index 0bd0fce..184c506 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -186,7 +186,7 @@ gpopen(dev, flags, fmt, td)
return (EBUSY);
/* Have memory for buffer? */
- sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, M_WAITOK);
+ sc->sc_inbuf = malloc(BUFSIZE, M_DEVBUF, 0);
if (sc->sc_inbuf == 0)
return (ENOMEM);
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index b64f978..a96d5fa 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -136,11 +136,11 @@ static struct mbuf *makembuf (void *buf, unsigned len)
{
struct mbuf *m, *o, *p;
- MGETHDR (m, M_DONTWAIT, MT_DATA);
+ MGETHDR (m, M_NOWAIT, MT_DATA);
if (! m)
return (0);
if (len >= MINCLSIZE)
- MCLGET (m, M_DONTWAIT);
+ MCLGET (m, M_NOWAIT);
m->m_pkthdr.len = len;
m->m_len = 0;
@@ -153,13 +153,13 @@ static struct mbuf *makembuf (void *buf, unsigned len)
if (! n) {
/* Allocate new mbuf. */
o = p;
- MGET (p, M_DONTWAIT, MT_DATA);
+ MGET (p, M_NOWAIT, MT_DATA);
if (! p) {
m_freem (m);
return (0);
}
if (len >= MINCLSIZE)
- MCLGET (p, M_DONTWAIT);
+ MCLGET (p, M_NOWAIT);
p->m_len = 0;
o->m_next = p;
diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c
index dd62365..60abe60 100644
--- a/sys/i386/isa/if_el.c
+++ b/sys/i386/isa/if_el.c
@@ -671,7 +671,7 @@ elget(buf, totlen, ifp)
cp = buf;
epkt = cp + totlen;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == 0)
return (0);
m->m_pkthdr.rcvif = ifp;
@@ -681,7 +681,7 @@ elget(buf, totlen, ifp)
mp = &top;
while (totlen > 0) {
if (top) {
- MGET(m, M_DONTWAIT, MT_DATA);
+ MGET(m, M_NOWAIT, MT_DATA);
if (m == 0) {
m_freem(top);
return (0);
@@ -690,7 +690,7 @@ elget(buf, totlen, ifp)
}
len = min(totlen, epkt - cp);
if (len >= MINCLSIZE) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if (m->m_flags & M_EXT)
m->m_len = len = min(len, MCLBYTES);
else
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 3ed6a96..d3dd2f1 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -386,7 +386,7 @@ le_input(
struct ifnet *ifp = &sc->le_if;
struct mbuf *m;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL) {
ifp->if_ierrors++;
return;
@@ -394,14 +394,14 @@ le_input(
m->m_pkthdr.len = total_len;
m->m_pkthdr.rcvif = ifp;
if (total_len + LE_XTRA > MHLEN /* >= MINCLSIZE */) {
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
if ((m->m_flags & M_EXT) == 0) {
m_free(m);
ifp->if_ierrors++;
return;
}
} else if (total_len + LE_XTRA > MHLEN && MINCLSIZE == (MHLEN+MLEN)) {
- MGET(m->m_next, M_DONTWAIT, MT_DATA);
+ MGET(m->m_next, M_NOWAIT, MT_DATA);
if (m->m_next == NULL) {
m_free(m);
ifp->if_ierrors++;
diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c
index 574d3e7..84cd174 100644
--- a/sys/i386/isa/if_rdp.c
+++ b/sys/i386/isa/if_rdp.c
@@ -1095,7 +1095,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
size_t s;
/* Allocate a header mbuf */
- MGETHDR(m, M_DONTWAIT, MT_DATA);
+ MGETHDR(m, M_NOWAIT, MT_DATA);
if (m == NULL)
return;
m->m_pkthdr.rcvif = ifp;
@@ -1109,7 +1109,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
*/
if ((len + ETHER_ALIGN) > MHLEN) {
/* Attach an mbuf cluster */
- MCLGET(m, M_DONTWAIT);
+ MCLGET(m, M_NOWAIT);
/* Insist on getting a cluster */
if ((m->m_flags & M_EXT) == 0) {
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 59c4b6e..9e32538 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -402,7 +402,7 @@ loranwrite(dev_t dev, struct uio * uio, int ioflag)
idx = minor(dev);
- MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, M_WAITOK);
+ MALLOC(this, struct datapoint *, sizeof *this, M_LORAN, 0);
c = imin(uio->uio_resid, (int)sizeof *this);
err = uiomove((caddr_t)this, c, uio);
if (err) {
diff --git a/sys/i386/isa/pcvt/pcvt_kbd.c b/sys/i386/isa/pcvt/pcvt_kbd.c
index d104196..d3362e3 100644
--- a/sys/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/i386/isa/pcvt/pcvt_kbd.c
@@ -330,7 +330,7 @@ void ovlinit(int force)
{
if(ovlinitflag == 0 &&
(ovltbl = (Ovl_tbl *)malloc(sizeof(Ovl_tbl) * OVLTBL_SIZE,
- M_DEVBUF, M_WAITOK)) == NULL)
+ M_DEVBUF, 0)) == NULL)
panic("pcvt_kbd: malloc of Ovl_tbl failed");
for(i=0; i<OVLTBL_SIZE; i++)
diff --git a/sys/i386/isa/pcvt/pcvt_out.c b/sys/i386/isa/pcvt/pcvt_out.c
index 8c77933..d908c7b 100644
--- a/sys/i386/isa/pcvt/pcvt_out.c
+++ b/sys/i386/isa/pcvt/pcvt_out.c
@@ -1305,7 +1305,7 @@ vt_coldmalloc(void)
for(nscr = 0; nscr < PCVT_NSCREENS; nscr++)
{
if((vs[nscr].Memory = (u_short *)malloc(screen_max_size * 2,
- M_DEVBUF, M_WAITOK)) == NULL)
+ M_DEVBUF, 0)) == NULL)
{
printf("pcvt: screen memory malloc failed, "
"NSCREEN=%d, nscr=%d\n",
diff --git a/sys/i386/isa/pcvt/pcvt_sup.c b/sys/i386/isa/pcvt/pcvt_sup.c
index 4df2971..5f08f40 100644
--- a/sys/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/i386/isa/pcvt/pcvt_sup.c
@@ -1409,7 +1409,7 @@ loadchar(int fontset, int character, int char_scanlines, u_char *char_table)
if(saved_charsets[fontset] == 0)
saved_charsets[fontset] =
- (u_char *)malloc(32 * 256, M_DEVBUF, M_WAITOK);
+ (u_char *)malloc(32 * 256, M_DEVBUF, 0);
if((bak = saved_charsets[fontset]))
{
diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c
index de4c5ca..e6487c1 100644
--- a/sys/i386/isa/spkr.c
+++ b/sys/i386/isa/spkr.c
@@ -495,7 +495,7 @@ spkropen(dev, flags, fmt, td)
(void) printf("spkropen: about to perform play initialization\n");
#endif /* DEBUG */
playinit();
- spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, M_WAITOK);
+ spkr_inbuf = malloc(DEV_BSIZE, M_SPKR, 0);
spkr_active = TRUE;
return(0);
}
diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c
index 5284cec..c368e4d 100644
--- a/sys/i386/isa/vesa.c
+++ b/sys/i386/isa/vesa.c
@@ -694,7 +694,7 @@ vesa_bios_init(void)
if (modes >= vesa_vmode_max) {
vesa_vmode_max += MODE_TABLE_DELTA;
p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, 0);
#if VESA_DEBUG > 1
printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n",
modes, vesa_vmode_max);
@@ -1341,7 +1341,7 @@ get_palette(video_adapter_t *adp, int base, int count,
if (bits <= 6)
return 1;
- r = malloc(count*3, M_DEVBUF, M_WAITOK);
+ r = malloc(count*3, M_DEVBUF, 0);
g = r + count;
b = g + count;
error = vesa_bios_save_palette2(base, count, r, g, b, bits);
@@ -1378,7 +1378,7 @@ set_palette(video_adapter_t *adp, int base, int count,
|| ((bits = vesa_bios_set_dac(8)) <= 6))
return 1;
- r = malloc(count*3, M_DEVBUF, M_WAITOK);
+ r = malloc(count*3, M_DEVBUF, 0);
g = r + count;
b = g + count;
copyin(red, r, count);
diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c
index ab5d4c3..37627d2 100644
--- a/sys/i386/isa/wt.c
+++ b/sys/i386/isa/wt.c
@@ -343,7 +343,7 @@ wtopen (dev_t dev, int flag, int fmt, struct thread *td)
return (ENXIO);
t->bsize = (minor (dev) & WT_BSIZE) ? 1024 : 512;
- t->buf = malloc (t->bsize, M_TEMP, M_WAITOK);
+ t->buf = malloc (t->bsize, M_TEMP, 0);
if (! t->buf)
return (EAGAIN);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 63ff5d7..70fe108 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -731,7 +731,7 @@ linux_aout_coredump(struct thread *td, struct vnode *vp, off_t limit)
vm->vm_dsize + vm->vm_ssize) >= limit)
return (EFAULT);
tempuser = malloc(ctob(uarea_pages + kstack_pages), M_TEMP,
- M_WAITOK | M_ZERO);
+ M_ZERO);
if (tempuser == NULL)
return (ENOMEM);
PROC_LOCK(p);
OpenPOWER on IntegriCloud