D50094.id154597.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50094.id154597.diff
View Options

	Index: sys/vm/uma_core.c
	===================================================================
	--- sys/vm/uma_core.c
	+++ sys/vm/uma_core.c
	@@ -1986,18 +1986,18 @@
	}
	if (__predict_false(p == NULL))
	goto fail;
	- TAILQ_INSERT_TAIL(&alloctail, p, listq);
	+ TAILQ_INSERT_TAIL(&alloctail, p, plinks.q);
	}
	if ((addr = kva_alloc(bytes)) == 0)
	goto fail;
	zkva = addr;
	- TAILQ_FOREACH(p, &alloctail, listq) {
	+ TAILQ_FOREACH(p, &alloctail, plinks.q) {
	pmap_qenter(zkva, &p, 1);
	zkva += PAGE_SIZE;
	}
	return ((void*)addr);
	fail:
	- TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) {
	+ TAILQ_FOREACH_SAFE(p, &alloctail, plinks.q, p_next) {
	vm_page_unwire_noq(p);
	vm_page_free(p);
	}
	@@ -2036,11 +2036,7 @@
	while (npages > 0) {
	p = vm_page_alloc_noobj_domain(domain, req);
	if (p != NULL) {
	- /*
	- * Since the page does not belong to an object, its
	- * listq is unused.
	- */
	- TAILQ_INSERT_TAIL(&alloctail, p, listq);
	+ TAILQ_INSERT_TAIL(&alloctail, p, plinks.q);
	npages--;
	continue;
	}
	@@ -2048,7 +2044,7 @@
	* Page allocation failed, free intermediate pages and
	* exit.
	*/
	- TAILQ_FOREACH_SAFE(p, &alloctail, listq, p_next) {
	+ TAILQ_FOREACH_SAFE(p, &alloctail, plinks.q, p_next) {
	vm_page_unwire_noq(p);
	vm_page_free(p);
	}
	@@ -2058,7 +2054,7 @@
	zkva = keg->uk_kva +
	atomic_fetchadd_long(&keg->uk_offset, round_page(bytes));
	retkva = zkva;
	- TAILQ_FOREACH(p, &alloctail, listq) {
	+ TAILQ_FOREACH(p, &alloctail, plinks.q) {
	pmap_qenter(zkva, &p, 1);
	zkva += PAGE_SIZE;
	}