o Remove GIANT_REQUIRED from vm_map_madvise(). Instead, acquire and

   release Giant around vm_map_madvise()'s call to pmap_object_init_pt().
 o Replace GIANT_REQUIRED in vm_object_madvise() with the acquisition
   and release of Giant.
 o Remove the acquisition and release of Giant from madvise().

1 files changed, 4 insertions, 5 deletions

diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
index d2d2851..fca62e7 100644
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -743,7 +743,6 @@ madvise(td, uap)
 	struct madvise_args *uap;
 {
 	vm_offset_t start, end;
-	int ret;
 
 	/*
 	 * Check for illegal behavior
@@ -771,10 +770,10 @@ madvise(td, uap)
 	start = trunc_page((vm_offset_t) uap->addr);
 	end = round_page((vm_offset_t) uap->addr + uap->len);
 	
-	mtx_lock(&Giant);
-	ret = vm_map_madvise(&td->td_proc->p_vmspace->vm_map, start, end, uap->behav);
-	mtx_unlock(&Giant);
-	return (ret ? EINVAL : 0);
+	if (vm_map_madvise(&td->td_proc->p_vmspace->vm_map, start, end,
+	    uap->behav))
+		return (EINVAL);
+	return (0);
 }
 
 #ifndef _SYS_SYSPROTO_H_