summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpf <mpf@openbsd.org>2005-11-23 10:00:12 +0000
committermpf <mpf@openbsd.org>2005-11-23 10:00:12 +0000
commit61e5cfafa146d2f15d8f8d8b97a913d9a3069f44 (patch)
treedca7924b1ae23cb499513b0279da944fa0f84034
parentinitial bits for -T support; (diff)
downloadwireguard-openbsd-61e5cfafa146d2f15d8f8d8b97a913d9a3069f44.tar.xz
wireguard-openbsd-61e5cfafa146d2f15d8f8d8b97a913d9a3069f44.zip
Correct malloc flag handling.
OK deraadt@ mickey@
-rw-r--r--sys/dev/isa/isadma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index f73875079e4..6c372b26ef1 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isadma.c,v 1.28 2005/11/21 14:25:09 mickey Exp $ */
+/* $OpenBSD: isadma.c,v 1.29 2005/11/23 10:00:12 mpf Exp $ */
/* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */
/*-
@@ -683,7 +683,7 @@ isa_malloc(isadev, chan, size, pool, flags)
int bflags;
struct isa_mem *m;
- bflags = flags & M_WAITOK ? BUS_DMA_WAITOK : BUS_DMA_NOWAIT;
+ bflags = flags & M_NOWAIT ? BUS_DMA_NOWAIT : BUS_DMA_WAITOK;
if (isa_dmamem_alloc(isadev, chan, size, &addr, bflags))
return 0;