diff options
| author | Alan Cox <alc@FreeBSD.org> | 2009-07-05 21:40:21 +0000 |
|---|---|---|
| committer | Alan Cox <alc@FreeBSD.org> | 2009-07-05 21:40:21 +0000 |
| commit | 0e18ab26d019f110355ba641d183be09567ea6a3 (patch) | |
| tree | 1d6b58eb744c93883d2998b4a07d6cb3ac7511d8 /sys | |
| parent | 24d3677b9d2ab35721d5522a99f46ff2885faaff (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/i386/pmap.c | 7 | ||||
| -rw-r--r-- | sys/i386/xen/pmap.c | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index e8926a8fdcc0..d16632ae3377 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -562,17 +562,14 @@ pmap_page_init(vm_page_t m) } #ifdef PAE - -static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); - static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { /* Inform UMA that this allocator uses kernel_map/object. */ *flags = UMA_SLAB_KERNEL; - return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, - 1, 0)); + return ((void *)kmem_alloc_contig(kernel_map, bytes, wait, 0x0ULL, + 0xffffffffULL, 1, 0, VM_CACHE_DEFAULT)); } #endif diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index 59947e8245f7..ed4300fe3c6c 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -608,15 +608,14 @@ pmap_page_init(vm_page_t m) } #if defined(PAE) && !defined(XEN) - -static MALLOC_DEFINE(M_PMAPPDPT, "pmap", "pmap pdpt"); - static void * pmap_pdpt_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) { - *flags = UMA_SLAB_PRIV; - return (contigmalloc(PAGE_SIZE, M_PMAPPDPT, 0, 0x0ULL, 0xffffffffULL, - 1, 0)); + + /* Inform UMA that this allocator uses kernel_map/object. */ + *flags = UMA_SLAB_KERNEL; + return ((void *)kmem_alloc_contig(kernel_map, bytes, wait, 0x0ULL, + 0xffffffffULL, 1, 0, VM_CACHE_DEFAULT)); } #endif |