diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-04-14 16:01:05 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-04-14 16:01:05 +0000 |
| commit | 736b9535289dd9e3a0ffaafbb736c868a7f377d6 (patch) | |
| tree | 608c5bb2fc645051c56618391202edc1c0f9e6e8 /sys/dev | |
| parent | 1b91dd8d89d56b40421b288402b14602db6d9a0f (diff) | |
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@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/aha.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index e96d7204819..aeeef8431c1 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.62 2009/02/16 21:19:07 miod Exp $ */ +/* $OpenBSD: aha.c,v 1.63 2009/04/14 16:01:04 oga Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -1122,10 +1122,10 @@ aha_init(sc) */ size = round_page(sizeof(struct aha_mbx)); TAILQ_INIT(&pglist); - if (uvm_pglistalloc(size, 0, 0xffffff, PAGE_SIZE, 0, &pglist, 1, 0) || - uvm_map(kernel_map, &va, size, NULL, UVM_UNKNOWN_OFFSET, 0, - UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_NONE, - UVM_ADV_RANDOM, 0))) + if (uvm_pglistalloc(size, 0, 0xffffff, PAGE_SIZE, 0, &pglist, 1, + UVM_PLA_NOWAIT) || uvm_map(kernel_map, &va, size, NULL, + UVM_UNKNOWN_OFFSET, 0, UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, + UVM_INH_NONE, UVM_ADV_RANDOM, 0))) panic("aha_init: could not allocate mailbox"); wmbx = (struct aha_mbx *)va; |