Back out the functional parts from r197537. After r197711, affecting all

user mappings, mmap no longer needs special treatment.
This commit is contained in:
Bjoern A. Zeeb 2009-10-02 17:51:46 +00:00
parent 878adb8517
commit fc50832731

View File

@ -96,14 +96,6 @@ static int max_proc_mmap;
SYSCTL_INT(_vm, OID_AUTO, max_proc_mmap, CTLFLAG_RW, &max_proc_mmap, 0,
"Maximum number of memory-mapped files per process");
/*
* 'mmap_zero' determines whether or not MAP_FIXED mmap() requests for
* virtual address zero are permitted.
*/
static int mmap_zero;
SYSCTL_INT(_security_bsd, OID_AUTO, mmap_zero, CTLFLAG_RW, &mmap_zero, 0,
"Processes may map an object at virtual address zero");
/*
* Set the maximum number of vm_map_entry structures per process. Roughly
* speaking vm_map_entry structures are tiny, so allowing them to eat 1/100
@ -277,13 +269,6 @@ mmap(td, uap)
if (addr & PAGE_MASK)
return (EINVAL);
/*
* Mapping to address zero is only permitted if
* mmap_zero is enabled.
*/
if (addr == 0 && !mmap_zero)
return (EINVAL);
/* Address range must be all in user VM space. */
if (addr < vm_map_min(&vms->vm_map) ||
addr + size > vm_map_max(&vms->vm_map))