summaryrefslogtreecommitdiffstats
path: root/sys/pci/ncr.c
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2004-01-13 07:45:10 +0000
committeralc <alc@FreeBSD.org>2004-01-13 07:45:10 +0000
commit6f8b6443ffe523de1cd6efe71c91130adcb88ce4 (patch)
tree0eda894f3bf7f6e8e84b2c91533b2a418da8189f /sys/pci/ncr.c
parentc52adee7f08645b8da4bd51e2d4b64796b842488 (diff)
downloadFreeBSD-src-6f8b6443ffe523de1cd6efe71c91130adcb88ce4.zip
FreeBSD-src-6f8b6443ffe523de1cd6efe71c91130adcb88ce4.tar.gz
Replace calls to vm_page_alloc_contig() by calls to contigmalloc().
vm_page_alloc_contig() will be removed after the three remaining drivers that use it are also converted to contigmalloc().
Diffstat (limited to 'sys/pci/ncr.c')
-rw-r--r--sys/pci/ncr.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 31d2fa0..2a7cf3c 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -3594,19 +3594,18 @@ ncr_attach (device_t dev)
np->bst2 = rman_get_bustag(np->sram_res);
np->bsh2 = rman_get_bushandle(np->sram_res);
} else if (sizeof (struct script) > PAGE_SIZE) {
- np->script = (struct script*) vm_page_alloc_contig
- (round_page(sizeof (struct script)),
- 0, 0xffffffff, PAGE_SIZE);
+ np->script = (struct script*) contigmalloc
+ (round_page(sizeof (struct script)), M_DEVBUF, M_WAITOK,
+ 0, 0xffffffff, PAGE_SIZE, 0);
} else {
np->script = (struct script *)
malloc (sizeof (struct script), M_DEVBUF, M_WAITOK);
}
- /* XXX JGibbs - Use contigmalloc */
if (sizeof (struct scripth) > PAGE_SIZE) {
- np->scripth = (struct scripth*) vm_page_alloc_contig
- (round_page(sizeof (struct scripth)),
- 0, 0xffffffff, PAGE_SIZE);
+ np->scripth = (struct scripth*) contigmalloc
+ (round_page(sizeof (struct scripth)), M_DEVBUF, M_WAITOK,
+ 0, 0xffffffff, PAGE_SIZE, 0);
} else
{
np->scripth = (struct scripth *)
OpenPOWER on IntegriCloud