D24474.id70703.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D24474.id70703.diff
View Options

	Index: sys/vm/vm_kern.c
	===================================================================
	--- sys/vm/vm_kern.c
	+++ sys/vm/vm_kern.c
	@@ -402,14 +402,10 @@
	vm_offset_t addr;
	int rv;

	-#if VM_NRESERVLEVEL > 0
	if (__predict_true((flags & M_EXEC) == 0))
	arena = vm_dom[domain].vmd_kernel_arena;
	else
	arena = vm_dom[domain].vmd_kernel_rwx_arena;
	-#else
	- arena = vm_dom[domain].vmd_kernel_arena;
	-#endif
	size = round_page(size);
	if (vmem_alloc(arena, size, flags \| M_BESTFIT, &addr))
	return (0);
	@@ -501,10 +497,8 @@
	vm_page_valid(m);
	pmap_enter(kernel_pmap, addr + i, m, prot,
	prot \| PMAP_ENTER_WIRED, 0);
	-#if VM_NRESERVLEVEL > 0
	if (__predict_false((prot & VM_PROT_EXECUTE) != 0))
	m->oflags \|= VPO_KMEM_EXEC;
	-#endif
	}
	VM_OBJECT_WUNLOCK(object);

	@@ -578,14 +572,10 @@
	VM_OBJECT_WLOCK(object);
	m = vm_page_lookup(object, atop(offset));
	domain = vm_phys_domain(m);
	-#if VM_NRESERVLEVEL > 0
	if (__predict_true((m->oflags & VPO_KMEM_EXEC) == 0))
	arena = vm_dom[domain].vmd_kernel_arena;
	else
	arena = vm_dom[domain].vmd_kernel_rwx_arena;
	-#else
	- arena = vm_dom[domain].vmd_kernel_arena;
	-#endif
	for (; offset < end; offset += PAGE_SIZE, m = next) {
	next = vm_page_next(m);
	vm_page_xbusy_claim(m);
	@@ -814,6 +804,9 @@
	vmem_set_import(vm_dom[domain].vmd_kernel_rwx_arena,
	kva_import_domain, (vmem_release_t *)vmem_xfree,
	kernel_arena, KVA_QUANTUM);
	+#else
	+ vm_dom[domain].vmd_kernel_rwx_arena =
	+ vm_dom[domain].vmd_kernel_arena;
	#endif
	}