From e53f32ace56685fbaf13094e66888fe5224cde60 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 2 Aug 2003 19:26:09 +0000 Subject: [PATCH] Use kmem_alloc_nofault() rather than kmem_alloc_pageable() in pmap_mapdev(). See revision 1.140 of kern/sys_pipe.c for a detailed rationale. Submitted by: tegge --- sys/amd64/amd64/pmap.c | 2 +- sys/powerpc/aim/mmu_oea.c | 2 +- sys/powerpc/powerpc/mmu_oea.c | 2 +- sys/powerpc/powerpc/pmap.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index aa1494647df..c3996dea04d 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -2820,7 +2820,7 @@ pmap_mapdev(pa, size) return ((void *)PHYS_TO_DMAP(pa)); offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); - va = kmem_alloc_pageable(kernel_map, size); + va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pa = pa & PG_FRAME; diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 6d607291d3d..5afcde885aa 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -2313,7 +2313,7 @@ pmap_mapdev(vm_offset_t pa, vm_size_t size) return ((void *) pa); } - va = kmem_alloc_pageable(kernel_map, size); + va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); diff --git a/sys/powerpc/powerpc/mmu_oea.c b/sys/powerpc/powerpc/mmu_oea.c index 6d607291d3d..5afcde885aa 100644 --- a/sys/powerpc/powerpc/mmu_oea.c +++ b/sys/powerpc/powerpc/mmu_oea.c @@ -2313,7 +2313,7 @@ pmap_mapdev(vm_offset_t pa, vm_size_t size) return ((void *) pa); } - va = kmem_alloc_pageable(kernel_map, size); + va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); diff --git a/sys/powerpc/powerpc/pmap.c b/sys/powerpc/powerpc/pmap.c index 6d607291d3d..5afcde885aa 100644 --- a/sys/powerpc/powerpc/pmap.c +++ b/sys/powerpc/powerpc/pmap.c @@ -2313,7 +2313,7 @@ pmap_mapdev(vm_offset_t pa, vm_size_t size) return ((void *) pa); } - va = kmem_alloc_pageable(kernel_map, size); + va = kmem_alloc_nofault(kernel_map, size); if (!va) panic("pmap_mapdev: Couldn't alloc kernel virtual memory");