d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o Remove GIANT_REQUIRED from kmem_alloc_pageable(), kmem_alloc_nofault(),

Browse Source 
and kmem_free().  (Annotate as MPSAFE.)
 o Remove incorrect casts from kmem_alloc_pageable() and kmem_alloc_nofault().
This commit is contained in:
Alan Cox 2002-06-23 18:07:40 +00:00
parent fd9fc3f0c2
commit 848d14193d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/vm/vm_kern.c
View File

@ -96,6 +96,8 @@ vm_map_t buffer_map=0;
* *
* Allocate pageable memory to the kernel's address map. * Allocate pageable memory to the kernel's address map.
* "map" must be kernel_map or a submap of kernel_map. * "map" must be kernel_map or a submap of kernel_map.
*
* MPSAFE
*/ */
vm_offset_t vm_offset_t
kmem_alloc_pageable(map, size) kmem_alloc_pageable(map, size)
@ -105,11 +107,9 @@ kmem_alloc_pageable(map, size)
vm_offset_t addr; vm_offset_t addr;
int result; int result;
GIANT_REQUIRED;
size = round_page(size); size = round_page(size);
addr = vm_map_min(map); addr = vm_map_min(map);
result = vm_map_find(map, NULL, (vm_offset_t) 0, result = vm_map_find(map, NULL, 0,
&addr, size, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0); &addr, size, TRUE, VM_PROT_ALL, VM_PROT_ALL, 0);
if (result != KERN_SUCCESS) { if (result != KERN_SUCCESS) {
return (0); return (0);
@ -121,6 +121,8 @@ kmem_alloc_pageable(map, size)
* kmem_alloc_nofault: * kmem_alloc_nofault:
* *
* Same as kmem_alloc_pageable, except that it create a nofault entry. * Same as kmem_alloc_pageable, except that it create a nofault entry.
*
* MPSAFE
*/ */
vm_offset_t vm_offset_t
kmem_alloc_nofault(map, size) kmem_alloc_nofault(map, size)
@ -130,11 +132,9 @@ kmem_alloc_nofault(map, size)
vm_offset_t addr; vm_offset_t addr;
int result; int result;
GIANT_REQUIRED;
size = round_page(size); size = round_page(size);
addr = vm_map_min(map); addr = vm_map_min(map);
result = vm_map_find(map, NULL, (vm_offset_t) 0, result = vm_map_find(map, NULL, 0,
&addr, size, TRUE, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT); &addr, size, TRUE, VM_PROT_ALL, VM_PROT_ALL, MAP_NOFAULT);
if (result != KERN_SUCCESS) { if (result != KERN_SUCCESS) {
return (0); return (0);
@ -225,6 +225,8 @@ kmem_alloc(map, size)
* associated with that region. * associated with that region.
* *
* This routine may not block on kernel maps. * This routine may not block on kernel maps.
*
* MPSAFE
*/ */
void void
kmem_free(map, addr, size) kmem_free(map, addr, size)
@ -232,7 +234,6 @@ kmem_free(map, addr, size)
vm_offset_t addr; vm_offset_t addr;
vm_size_t size; vm_size_t size;
{ {
GIANT_REQUIRED;
(void) vm_map_remove(map, trunc_page(addr), round_page(addr + size)); (void) vm_map_remove(map, trunc_page(addr), round_page(addr + size));
} }