Convert the waitok field of uvm_pglistalloc to "flags", more will be added soon.

For the possibility of sleeping, the first two flags are UVM_PLA_WAITOK
and UVM_PLA_NOWAIT. It is an error not to show intention, so assert that
one of the two is provided. Switch over every caller in the tree to
using the appropriate flag.

ok art@, ariane@

2 files changed, 5 insertions, 5 deletions

diff --git a/sys/arch/mac68k/dev/if_mc_obio.c b/sys/arch/mac68k/dev/if_mc_obio.c
index 7d0f1664a6e..5601ebd76c5 100644
--- a/sys/arch/mac68k/dev/if_mc_obio.c
+++ b/sys/arch/mac68k/dev/if_mc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc_obio.c,v 1.7 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: if_mc_obio.c,v 1.8 2009/04/14 16:01:04 oga Exp $	*/
 /*	$NetBSD: if_mc_obio.c,v 1.13 2004/03/26 12:15:46 wiz Exp $	*/
 
 /*-
@@ -139,7 +139,7 @@ mc_obio_attach(parent, self, aux)
 	/* allocate memory for transmit buffer and mark it non-cacheable */
 	TAILQ_INIT(&txlist);
 	if (uvm_pglistalloc(PAGE_SIZE, 0, -PAGE_SIZE, PAGE_SIZE, 0,
-	    &txlist, 1, 0) != 0) {
+	    &txlist, 1, UVM_PLA_NOWAIT) != 0) {
 		printf(": could not allocate transmit buffer memory\n");
 		goto out1;
 	}
@@ -159,7 +159,7 @@ mc_obio_attach(parent, self, aux)
 	 */
 	TAILQ_INIT(&rxlist);
 	if (uvm_pglistalloc(MC_NPAGES * PAGE_SIZE, 0, -PAGE_SIZE, PAGE_SIZE, 0,
-	    &rxlist, 1, 0) != 0) {
+	    &rxlist, 1, UVM_PLA_NOWAIT) != 0) {
 		printf(": could not allocate receive buffer memory\n");
 		goto out3;
 	}
diff --git a/sys/arch/mac68k/dev/if_sn.c b/sys/arch/mac68k/dev/if_sn.c
index c9eb7a0c297..74bf85d5c3d 100644
--- a/sys/arch/mac68k/dev/if_sn.c
+++ b/sys/arch/mac68k/dev/if_sn.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_sn.c,v 1.52 2009/03/29 21:53:52 sthen Exp $        */
+/*    $OpenBSD: if_sn.c,v 1.53 2009/04/14 16:01:04 oga Exp $        */
 /*    $NetBSD: if_sn.c,v 1.13 1997/04/25 03:40:10 briggs Exp $        */
 
 /*
@@ -114,7 +114,7 @@ snsetup(struct sn_softc *sc, u_int8_t *lladdr)
 	 */
 	TAILQ_INIT(&pglist);
 	error = uvm_pglistalloc(SN_NPAGES * PAGE_SIZE, 0, -PAGE_SIZE,
-	    PAGE_SIZE, 0, &pglist, 1, 0);
+	    PAGE_SIZE, 0, &pglist, 1, UVM_PLA_NOWAIT);
 	if (error != 0) {
 		printf(": could not allocate descriptor memory\n");
 		return (error);