29c29
< __FBSDID("$FreeBSD: head/sys/kern/kern_mbuf.c 193511 2009-06-05 14:55:22Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/kern/kern_mbuf.c 194454 2009-06-18 17:59:04Z alc $");
46a47,48
> #include <vm/vm_extern.h>
> #include <vm/vm_kern.h>
235d236
< static void mbuf_jumbo_free(void *, int, u_int8_t);
237,238d237
< static MALLOC_DEFINE(M_JUMBOFRAME, "jumboframes", "mbuf jumbo frame buffers");
<
299d297
< uma_zone_set_freef(zone_jumbo9, mbuf_jumbo_free);
312d309
< uma_zone_set_freef(zone_jumbo16, mbuf_jumbo_free);
361,362c358,359
< return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0,
< ~(vm_paddr_t)0, 1, 0));
---
> return ((void *)kmem_alloc_contig(kernel_map, bytes, wait,
> (vm_paddr_t)0, ~(vm_paddr_t)0, 1, 0));
366,375d362
< * UMA backend page deallocator for the jumbo frame zones.
< */
< static void
< mbuf_jumbo_free(void *mem, int size, u_int8_t flags)
< {
<
< contigfree(mem, size, M_JUMBOFRAME);
< }
<
< /*
< __FBSDID("$FreeBSD: head/sys/kern/kern_mbuf.c 193511 2009-06-05 14:55:22Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/kern/kern_mbuf.c 194454 2009-06-18 17:59:04Z alc $");
46a47,48
> #include <vm/vm_extern.h>
> #include <vm/vm_kern.h>
235d236
< static void mbuf_jumbo_free(void *, int, u_int8_t);
237,238d237
< static MALLOC_DEFINE(M_JUMBOFRAME, "jumboframes", "mbuf jumbo frame buffers");
<
299d297
< uma_zone_set_freef(zone_jumbo9, mbuf_jumbo_free);
312d309
< uma_zone_set_freef(zone_jumbo16, mbuf_jumbo_free);
361,362c358,359
< return (contigmalloc(bytes, M_JUMBOFRAME, wait, (vm_paddr_t)0,
< ~(vm_paddr_t)0, 1, 0));
---
> return ((void *)kmem_alloc_contig(kernel_map, bytes, wait,
> (vm_paddr_t)0, ~(vm_paddr_t)0, 1, 0));
366,375d362
< * UMA backend page deallocator for the jumbo frame zones.
< */
< static void
< mbuf_jumbo_free(void *mem, int size, u_int8_t flags)
< {
<
< contigfree(mem, size, M_JUMBOFRAME);
< }
<
< /*