 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_vmem.c,v 1.67 2012/01/28 23:05:48 rmind Exp $	*/
+/*	$NetBSD: subr_vmem.c,v 1.68 2012/01/29 13:38:15 para Exp $	*/
 /*-
  * Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * reference:
  * -	Magazines and Vmem: Extending the Slab Allocator
  *	to Many CPUs and Arbitrary Resources
  *	http://www.usenix.org/event/usenix01/bonwick.html
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.67 2012/01/28 23:05:48 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.68 2012/01/29 13:38:15 para Exp $");
 #if defined(_KERNEL)
 #include "opt_ddb.h"
 #define	QCACHE
 #endif /* defined(_KERNEL) */
 #include <sys/param.h>
 #include <sys/hash.h>
 #include <sys/queue.h>
 #include <sys/bitops.h>
 #if defined(_KERNEL)
 #include <sys/systm.h>
 @@ -1237,26 +1237,33 @@ retry:
 		/*
 		 * XXX should try to import a region large enough to
 		 * satisfy restrictions?
 		 */
 		goto fail;
+	}
 	/* XXX eeek, minaddr & maxaddr not respected */
 	if (vmem_import(vm, size, flags) == 0) {
 		goto retry;
+	}
 	/* XXX */
 	if ((flags & VM_SLEEP) != 0) {
 		uvm_kick_pdaemon();
 		VMEM_LOCK(vm);
 		VMEM_CONDVAR_WAIT(vm);
 		VMEM_UNLOCK(vm);
 		goto retry;
+	}
 fail:
 	bt_free(vm, btnew);
 	bt_free(vm, btnew2);
 	return ENOMEM;
 gotit:
 	KASSERT(bt->bt_type == BT_TYPE_FREE);
 	KASSERT(bt->bt_size >= size);
 	bt_remfree(vm, bt);
 	vmem_check(vm);
 	if (bt->bt_start != start) {
 		btnew2->bt_type = BT_TYPE_FREE;
 		btnew2->bt_start = bt->bt_start;
 @@ -1375,41 +1382,44 @@ vmem_xfree(vmem_t *vm, vmem_addr_t addr,
 	if (vm->vm_releasefn != NULL && t->bt_type == BT_TYPE_SPAN &&
 	    t->bt_size == bt->bt_size) {
 		vmem_addr_t spanaddr;
 		vmem_size_t spansize;
 		KASSERT(t->bt_start == bt->bt_start);
 		spanaddr = bt->bt_start;
 		spansize = bt->bt_size;
 		bt_remseg(vm, bt);
 		LIST_INSERT_HEAD(&tofree, bt, bt_freelist);
 		bt_remseg(vm, t);
 		LIST_INSERT_HEAD(&tofree, t, bt_freelist);
 		vm->vm_size -= spansize;
 #if defined(_KERNEL)
 		VMEM_CONDVAR_BROADCAST(vm);
 #endif /* defined(_KERNEL) */
 		VMEM_UNLOCK(vm);
 		(*vm->vm_releasefn)(vm->vm_arg, spanaddr, spansize);
 	} else {
 		bt_insfree(vm, bt);
 #if defined(_KERNEL)
 		VMEM_CONDVAR_BROADCAST(vm);
 #endif /* defined(_KERNEL) */
 		VMEM_UNLOCK(vm);
+	}
 	while (!LIST_EMPTY(&tofree)) {
 		t = LIST_FIRST(&tofree);
 		LIST_REMOVE(t, bt_freelist);
 		bt_free(vm, t);
+	}
 #if defined(_KERNEL)
 	VMEM_CONDVAR_BROADCAST(vm);
 #endif /* defined(_KERNEL) */
+}
 /*
  * vmem_add:
+ *
  * => caller must ensure appropriate spl,
  *    if the arena can be accessed from interrupt context.
  */
 int
 vmem_add(vmem_t *vm, vmem_addr_t addr, vmem_size_t size, vm_flag_t flags)
+{
 @@ -1461,27 +1471,26 @@ vmem_rehash_all(struct work *wk, void *d
+		}
 		desired = vm->vm_nbusytag;
 		current = vm->vm_hashsize;
 		VMEM_UNLOCK(vm);
 		if (desired > VMEM_HASHSIZE_MAX) {
 			desired = VMEM_HASHSIZE_MAX;
 		} else if (desired < VMEM_HASHSIZE_MIN) {
 			desired = VMEM_HASHSIZE_MIN;
+		}
 		if (desired > current * 2 || desired * 2 < current) {
 			vmem_rehash(vm, desired, VM_NOSLEEP);
+		}
 		VMEM_CONDVAR_BROADCAST(vm);
+	}
 	mutex_exit(&vmem_list_lock);
 	callout_schedule(&vmem_rehash_ch, vmem_rehash_interval);
+}
 static void
 vmem_rehash_all_kick(void *dummy)
+{
 	workqueue_enqueue(vmem_rehash_wq, &vmem_rehash_wk, NULL);
+}