D18329.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D18329.diff
View Options

	Index: head/sys/vm/vm_map.c
	===================================================================
	--- head/sys/vm/vm_map.c
	+++ head/sys/vm/vm_map.c
	@@ -283,12 +283,7 @@
	struct vmspace *vm;

	vm = uma_zalloc(vmspace_zone, M_WAITOK);
	-
	KASSERT(vm->vm_map.pmap == NULL, ("vm_map.pmap must be NULL"));
	-
	- if (pinit == NULL)
	- pinit = &pmap_pinit;
	-
	if (!pinit(vmspace_pmap(vm))) {
	uma_zfree(vmspace_zone, vm);
	return (NULL);
	@@ -3424,7 +3419,8 @@

	old_map = &vm1->vm_map;
	/* Copy immutable fields of vm1 to vm2. */
	- vm2 = vmspace_alloc(vm_map_min(old_map), vm_map_max(old_map), NULL);
	+ vm2 = vmspace_alloc(vm_map_min(old_map), vm_map_max(old_map),
	+ pmap_pinit);
	if (vm2 == NULL)
	return (NULL);
	vm2->vm_taddr = vm1->vm_taddr;
	@@ -3975,7 +3971,7 @@

	KASSERT((curthread->td_pflags & TDP_EXECVMSPC) == 0,
	("vmspace_exec recursed"));
	- newvmspace = vmspace_alloc(minuser, maxuser, NULL);
	+ newvmspace = vmspace_alloc(minuser, maxuser, pmap_pinit);
	if (newvmspace == NULL)
	return (ENOMEM);
	newvmspace->vm_swrss = oldvmspace->vm_swrss;