From 2dc8633eab4405793e9cc4d7eb56f666f6ad8b61 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 13 Jan 2004 07:45:10 +0000 Subject: [PATCH] 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(). --- sys/pci/ncr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c index 31d2fa0f485..2a7cf3c3a6b 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 *)